fixes.

2 files changed, 11 insertions, 2 deletions

diff --git a/cpp/demo/Ice/session/Session.ice b/cpp/demo/Ice/session/Session.ice
index 118b15ccd00..32fbdd43a53 100644
--- a/cpp/demo/Ice/session/Session.ice
+++ b/cpp/demo/Ice/session/Session.ice
@@ -37,7 +37,7 @@ interface Session
      * Refresh a session. If a session is not refreshed on a regular
      * basis by the client it will be automatically destroyed.
      **/
-    void refresh();
+    idempotent void refresh();
 
     /** Mark the session as destroyed. */
     void destroy();
diff --git a/cpp/demo/Ice/session/SessionFactoryI.cpp b/cpp/demo/Ice/session/SessionFactoryI.cpp
index a6dcb48f2f4..55e3924ee79 100755
--- a/cpp/demo/Ice/session/SessionFactoryI.cpp
+++ b/cpp/demo/Ice/session/SessionFactoryI.cpp
@@ -92,7 +92,16 @@ SessionFactoryI::reap()
 	if(p->session->destroyed())
 	{
 	    p->session->destroyCallback();
-    	    _adapter->remove(p->id);
+	    try
+	    {
+		_adapter->remove(p->id);
+	    }
+	    catch(const Ice::ObjectAdapterDeactivatedException&)
+	    {
+		// This method can be called while the server is
+		// shutting down, in which case this exception is
+		// expected.
+	    }
     	    p = _sessions.erase(p);
 	}
 	else