diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-10-29 08:53:19 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-10-29 08:53:19 +0100 |
| commit | dedd44570d75d1c83ea7513b90a8aa457c0edb47 (patch) | |
| tree | 77c4dc6d472ecb2d27b8456f4a12d50aef0d3a7a /cpp/src/IceGrid/Topics.cpp | |
| parent | (ICE-5548) C++11 support with GCC - Ubuntu distribution updates (diff) | |
| download | ice-dedd44570d75d1c83ea7513b90a8aa457c0edb47.tar.bz2 ice-dedd44570d75d1c83ea7513b90a8aa457c0edb47.tar.xz ice-dedd44570d75d1c83ea7513b90a8aa457c0edb47.zip | |
Fixed ICE-5798: IceGrid registry prints ObjectAdapterDeactivatedException on shutdown
Diffstat (limited to 'cpp/src/IceGrid/Topics.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Topics.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp index 6bdc1a1ee64..df2fdf6649f 100644 --- a/cpp/src/IceGrid/Topics.cpp +++ b/cpp/src/IceGrid/Topics.cpp @@ -109,7 +109,13 @@ ObserverTopic::unsubscribe(const Ice::ObjectPrx& observer, const string& name) { return; } - p->second->unsubscribe(observer); + try + { + p->second->unsubscribe(observer); + } + catch(const Ice::ObjectAdapterDeactivatedException&) + { + } assert(observer); |