summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/ReplicaCache.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-10-14 14:33:52 +0200
committerBenoit Foucher <benoit@zeroc.com>2014-10-14 14:33:52 +0200
commit49ccc027b85e6f5624793ed485706310b3ff5e6d (patch)
treeea7435eeac78ac25ef933d8d05d90e1986ad8c98 /cpp/src/IceGrid/ReplicaCache.cpp
parentFixed ICE-5458: Locator::getRegistry now returns a replicated proxy (diff)
downloadice-49ccc027b85e6f5624793ed485706310b3ff5e6d.tar.bz2
ice-49ccc027b85e6f5624793ed485706310b3ff5e6d.tar.xz
ice-49ccc027b85e6f5624793ed485706310b3ff5e6d.zip
Fixed ICE-5701 & ICE-5721: warning on shutdown of replica
Diffstat (limited to 'cpp/src/IceGrid/ReplicaCache.cpp')
-rw-r--r--cpp/src/IceGrid/ReplicaCache.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/ReplicaCache.cpp b/cpp/src/IceGrid/ReplicaCache.cpp
index f0a22e58d06..119b54d4b92 100644
--- a/cpp/src/IceGrid/ReplicaCache.cpp
+++ b/cpp/src/IceGrid/ReplicaCache.cpp
@@ -122,7 +122,7 @@ ReplicaCache::remove(const string& name, bool shutdown)
{
_observers->replicaRemoved(entry->getProxy());
}
- catch(const Ice::ConnectFailedException&)
+ catch(const Ice::ObjectAdapterDeactivatedException&)
{
// Expected if the replica is being shutdown.
}
@@ -193,7 +193,7 @@ ReplicaCache::unsubscribe(const ReplicaObserverPrx& observer)
{
_topic->unsubscribe(observer);
}
- catch(const Ice::ConnectFailedException&)
+ catch(const Ice::ObjectAdapterDeactivatedException&)
{
// The replica is being shutdown.
}