summaryrefslogtreecommitdiff
path: root/py/demo/Ice/session/Server.py
diff options
context:
space:
mode:
Diffstat (limited to 'py/demo/Ice/session/Server.py')
-rw-r--r--py/demo/Ice/session/Server.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/py/demo/Ice/session/Server.py b/py/demo/Ice/session/Server.py
index 473d791c2a4..1588c147f97 100644
--- a/py/demo/Ice/session/Server.py
+++ b/py/demo/Ice/session/Server.py
@@ -157,7 +157,13 @@ class SessionFactoryI(Demo.SessionFactory):
for s in self._sessions:
if s.session.destroyed():
s.session.destroyCallback()
- self._adapter.remove(s.id)
+ try:
+ self._adapter.remove(s.id)
+ except Ice.ObjectAdapterDeactivatedException, ex:
+ # This method can be called while the server
+ # is shutting down, in which case this
+ # exception is expected.
+ pass
self._sessions.remove(s)
finally:
self._lock.release()