summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/Ice/ObjectAdapterI.cpp8
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)