1 files changed, 124 insertions, 124 deletions

diff --git a/cpp/demo/Ice/session/Client.cpp b/cpp/demo/Ice/session/Client.cpp
index 28a0393a1bd..89b05b09c1d 100755
--- a/cpp/demo/Ice/session/Client.cpp
+++ b/cpp/demo/Ice/session/Client.cpp
@@ -19,42 +19,42 @@ class SessionRefreshThread : public IceUtil::Thread, public IceUtil::Monitor<Ice
 public:
 
     SessionRefreshThread(const Ice::LoggerPtr& logger, const IceUtil::Time& timeout, const SessionPrx& session) :
-	_logger(logger),
-	_session(session),
-	_timeout(timeout),
-	_terminated(false)
+        _logger(logger),
+        _session(session),
+        _timeout(timeout),
+        _terminated(false)
     {
     }
 
     virtual void
     run()
     {
-	Lock sync(*this);
-	while(!_terminated)
-	{
-	    timedWait(_timeout);
-	    if(!_terminated)
-	    {
-		try
-		{
-		    _session->refresh();
-		}
-		catch(const Ice::Exception& ex)
-		{
-		    Ice::Warning warn(_logger);
-		    warn << "SessionRefreshThread: " << ex;
-    	    	    _terminated = true;
-		}
-	    }
-	}
+        Lock sync(*this);
+        while(!_terminated)
+        {
+            timedWait(_timeout);
+            if(!_terminated)
+            {
+                try
+                {
+                    _session->refresh();
+                }
+                catch(const Ice::Exception& ex)
+                {
+                    Ice::Warning warn(_logger);
+                    warn << "SessionRefreshThread: " << ex;
+                    _terminated = true;
+                }
+            }
+        }
     }
 
     void
     terminate()
     {
-	Lock sync(*this);
-	_terminated = true;
-	notify();
+        Lock sync(*this);
+        _terminated = true;
+        notify();
     }
 
 private:
@@ -109,24 +109,24 @@ SessionClient::run(int argc, char* argv[])
     cin >> name;
     if(!cin.good())
     {
-	return EXIT_FAILURE;
+        return EXIT_FAILURE;
     }
 
     Ice::ObjectPrx base = communicator()->propertyToProxy("SessionFactory.Proxy");
     SessionFactoryPrx factory = SessionFactoryPrx::checkedCast(base);
     if(!factory)
     {
-	cerr << argv[0] << ": invalid proxy" << endl;
-	return EXIT_FAILURE;
+        cerr << argv[0] << ": invalid proxy" << endl;
+        return EXIT_FAILURE;
     }
 
     {
-	IceUtil::Mutex::Lock sync(_mutex);
-	_session = factory->create(name);
-	
-	_refresh = new SessionRefreshThread(
-	    communicator()->getLogger(), IceUtil::Time::seconds(5), _session);
-	_refresh->start();
+        IceUtil::Mutex::Lock sync(_mutex);
+        _session = factory->create(name);
+        
+        _refresh = new SessionRefreshThread(
+            communicator()->getLogger(), IceUtil::Time::seconds(5), _session);
+        _refresh->start();
     }
 
     vector<HelloPrx> hellos;
@@ -135,85 +135,85 @@ SessionClient::run(int argc, char* argv[])
 
     try
     {
-    	bool destroy = true;
-	bool shutdown = false;
-	while(true)
-	{
-	    cout << "==> ";
-	    char c;
-	    cin >> c;
-    	    if(!cin.good())
-	    {
-		break;
-	    }
-	    if(isdigit(c))
-	    {
-		string s;
-		s += c;
-		vector<HelloPrx>::size_type index = atoi(s.c_str());
-		if(index < hellos.size())
-		{
-		    hellos[index]->sayHello();
-		}
-		else
-		{
-		    cout << "Index is too high. " << hellos.size() << " hello objects exist so far.\n"
-			 << "Use `c' to create a new hello object." << endl;
-		}
-	    }
-	    else if(c == 'c')
-	    {
-		hellos.push_back(_session->createHello());
-		cout << "Created hello object " << hellos.size() - 1 << endl;
-	    }
-	    else if(c == 's')
-	    {
-		destroy = false;
-		shutdown = true;
-    	    	break;
-	    }
-	    else if(c == 'x')
-	    {
-		break;
-	    }
-	    else if(c == 't')
-	    {
-		destroy = false;
-		break;
-	    }
-	    else if(c == '?')
-	    {
-		menu();
-	    }
-	    else
-	    {
-		cout << "Unknown command `" << c << "'." << endl;
-		menu();
-	    }
-	}
+        bool destroy = true;
+        bool shutdown = false;
+        while(true)
+        {
+            cout << "==> ";
+            char c;
+            cin >> c;
+            if(!cin.good())
+            {
+                break;
+            }
+            if(isdigit(c))
+            {
+                string s;
+                s += c;
+                vector<HelloPrx>::size_type index = atoi(s.c_str());
+                if(index < hellos.size())
+                {
+                    hellos[index]->sayHello();
+                }
+                else
+                {
+                    cout << "Index is too high. " << hellos.size() << " hello objects exist so far.\n"
+                         << "Use `c' to create a new hello object." << endl;
+                }
+            }
+            else if(c == 'c')
+            {
+                hellos.push_back(_session->createHello());
+                cout << "Created hello object " << hellos.size() - 1 << endl;
+            }
+            else if(c == 's')
+            {
+                destroy = false;
+                shutdown = true;
+                break;
+            }
+            else if(c == 'x')
+            {
+                break;
+            }
+            else if(c == 't')
+            {
+                destroy = false;
+                break;
+            }
+            else if(c == '?')
+            {
+                menu();
+            }
+            else
+            {
+                cout << "Unknown command `" << c << "'." << endl;
+                menu();
+            }
+        }
 
-	//
-	// The refresher thread must be terminated before destroy is
-	// called, otherwise it might get ObjectNotExistException. refresh
-	// is set to 0 so that if session->destroy() raises an exception
-	// the thread will not be re-terminated and re-joined.
-	//
-	cleanup(destroy);
-	if(shutdown)
-	{
-	    factory->shutdown();
-	}
+        //
+        // The refresher thread must be terminated before destroy is
+        // called, otherwise it might get ObjectNotExistException. refresh
+        // is set to 0 so that if session->destroy() raises an exception
+        // the thread will not be re-terminated and re-joined.
+        //
+        cleanup(destroy);
+        if(shutdown)
+        {
+            factory->shutdown();
+        }
     }
     catch(...)
     {
-	try
-	{
-	    cleanup(true);
-	}
-	catch(...)
-	{
-	}
-	throw;
+        try
+        {
+            cleanup(true);
+        }
+        catch(...)
+        {
+        }
+        throw;
     }
 
     return EXIT_SUCCESS;
@@ -232,15 +232,15 @@ SessionClient::interruptCallback(int)
 
     try
     {
-	communicator()->destroy();
+        communicator()->destroy();
     }
     catch(const IceUtil::Exception& ex)
     {
-	cerr << appName() << ": " << ex << endl;
+        cerr << appName() << ": " << ex << endl;
     }
     catch(...)
     {
-	cerr << appName() << ": unknown exception" << endl;
+        cerr << appName() << ": unknown exception" << endl;
     }
     exit(EXIT_SUCCESS);
 }
@@ -251,15 +251,15 @@ SessionClient::cleanup(bool destroy)
     IceUtil::Mutex::Lock sync(_mutex);
     if(_refresh)
     {
-	_refresh->terminate();
-	_refresh->getThreadControl().join();
-	_refresh = 0;
+        _refresh->terminate();
+        _refresh->getThreadControl().join();
+        _refresh = 0;
     }
     
     if(destroy && _session)
     {
-	_session->destroy();
-	_session = 0;
+        _session->destroy();
+        _session = 0;
     }
 }
 
@@ -267,11 +267,11 @@ void
 SessionClient::menu()
 {
     cout <<
-	"usage:\n"
-	"c:     create a new per-client hello object\n"
-	"0-9:   send a greeting to a hello object\n"
-	"s:     shutdown the server and exit\n"
-	"x:     exit\n"
-	"t:     exit without destroying the session\n"
-	"?:     help\n";
+        "usage:\n"
+        "c:     create a new per-client hello object\n"
+        "0-9:   send a greeting to a hello object\n"
+        "s:     shutdown the server and exit\n"
+        "x:     exit\n"
+        "t:     exit without destroying the session\n"
+        "?:     help\n";
 }