fixes.

1 files changed, 10 insertions, 1 deletions

diff --git a/java/demo/Ice/session/SessionFactoryI.java b/java/demo/Ice/session/SessionFactoryI.java
index c8b0bf12c69..f130899fe76 100644
--- a/java/demo/Ice/session/SessionFactoryI.java
+++ b/java/demo/Ice/session/SessionFactoryI.java
@@ -109,7 +109,16 @@ class SessionFactoryI extends _SessionFactoryDisp
     	    if(s.session.destroyed())
 	    {
 		s.session.destroyCallback();
-		_adapter.remove(s.id);
+		try
+		{
+		    _adapter.remove(s.id);
+		}
+		catch(Ice.ObjectAdapterDeactivatedException e)
+		{
+		    // This method can be called while the server is
+		    // shutting down, in which case this exception is
+		    // expected.
+		}
     	    	p.remove();
 	    }
 	}