diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-07-31 16:13:52 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-07-31 16:13:52 +0200 |
| commit | 03729879c74e073ab08af9a5839a0235df3836d3 (patch) | |
| tree | dc7dab96e38ebcd335c09ede0de0c2051bb056fd /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | Update nuget DB package version (diff) | |
| download | ice-03729879c74e073ab08af9a5839a0235df3836d3.tar.bz2 ice-03729879c74e073ab08af9a5839a0235df3836d3.tar.xz ice-03729879c74e073ab08af9a5839a0235df3836d3.zip | |
Fixed ICE-6625: warning when shutting IceDiscovery hello server
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index b2e556991d0..8321a89b23d 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -1337,6 +1337,14 @@ ObjectAdapterI::updateLocatorRegistry(const IceInternal::LocatorInfoPtr& locator ex.id = _id; throw ex; } + catch(const ObjectAdapterDeactivatedException&) + { + // Expected if collocated call and OA is deactivated, ignore. + } + catch(const CommunicatorDestroyedException&) + { + // Ignore. + } catch(const LocalException& ex) { if(_instance->traceLevels()->location >= 1) |