handle ObjectAdapterDeactivatedException.

1 files changed, 9 insertions, 1 deletions

diff --git a/cpp/demo/Ice/session/SessionI.cpp b/cpp/demo/Ice/session/SessionI.cpp
index 9b1a2325bf6..ec4ffc296ef 100755
--- a/cpp/demo/Ice/session/SessionI.cpp
+++ b/cpp/demo/Ice/session/SessionI.cpp
@@ -90,7 +90,15 @@ SessionI::destroyCallback()
 	 << ((IceUtil::Time::now()-_refreshTime) > _timeout) << endl;
     for(list<HelloPrx>::const_iterator p = _objs.begin(); p != _objs.end(); ++p)
     {
-	_adapter->remove((*p)->ice_getIdentity());
+	try
+	{
+	    _adapter->remove((*p)->ice_getIdentity());
+	}
+	catch(const Ice::ObjectAdapterDeactivatedException&)
+	{
+	    // This method is called on shutdown of the server, in
+	    // which case this exception is expected.
+	}
     }
     _objs.clear();
 }