diff options
author | Benoit Foucher <benoit@zeroc.com> | 2006-05-05 15:02:24 +0000 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2006-05-05 15:02:24 +0000 |
commit | c0e3f5c0ee63d08f86774b041a7da3476953ba29 (patch) | |
tree | 6edf42562fe9f85d7aa6e071fdae2de83a6a9d22 /cpp/src/IceGrid/NodeSessionI.cpp | |
parent | Removed session based locator, refactored allocation code. (diff) | |
download | ice-c0e3f5c0ee63d08f86774b041a7da3476953ba29.tar.bz2 ice-c0e3f5c0ee63d08f86774b041a7da3476953ba29.tar.xz ice-c0e3f5c0ee63d08f86774b041a7da3476953ba29.zip |
Fixed session shutdown.
Diffstat (limited to 'cpp/src/IceGrid/NodeSessionI.cpp')
-rw-r--r-- | cpp/src/IceGrid/NodeSessionI.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/cpp/src/IceGrid/NodeSessionI.cpp b/cpp/src/IceGrid/NodeSessionI.cpp index ceefcbbc6c7..a0f63926737 100644 --- a/cpp/src/IceGrid/NodeSessionI.cpp +++ b/cpp/src/IceGrid/NodeSessionI.cpp @@ -78,12 +78,15 @@ NodeSessionI::destroy(const Ice::Current& current) _database->removeNode(_name); - try - { - current.adapter->remove(current.id); - } - catch(const Ice::ObjectAdapterDeactivatedException&) + if(current.adapter) { + try + { + current.adapter->remove(current.id); + } + catch(const Ice::ObjectAdapterDeactivatedException&) + { + } } } |