summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/ReplicaCache.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceGrid/ReplicaCache.cpp')
-rw-r--r--cpp/src/IceGrid/ReplicaCache.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/ReplicaCache.cpp b/cpp/src/IceGrid/ReplicaCache.cpp
index a964755cc93..5bd4794edef 100644
--- a/cpp/src/IceGrid/ReplicaCache.cpp
+++ b/cpp/src/IceGrid/ReplicaCache.cpp
@@ -42,8 +42,8 @@ ReplicaCache::add(const string& name, const ReplicaSessionIPtr& session)
ReplicaEntryPtr entry;
while((entry = getImpl(name)))
{
- ReplicaSessionIPtr session = entry->getSession();
- if(session->isDestroyed())
+ ReplicaSessionIPtr s = entry->getSession();
+ if(s->isDestroyed())
{
wait(); // Wait for the session to be removed.
}
@@ -56,14 +56,14 @@ ReplicaCache::add(const string& name, const ReplicaSessionIPtr& session)
sync.release();
try
{
- session->getInternalRegistry()->ice_ping();
+ s->getInternalRegistry()->ice_ping();
throw ReplicaActiveException();
}
catch(const Ice::LocalException&)
{
try
{
- session->destroy(Ice::emptyCurrent);
+ s->destroy(Ice::emptyCurrent);
}
catch(const Ice::LocalException&)
{