summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/AdapterCache.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-11-14 09:25:45 +0100
committerBenoit Foucher <benoit@zeroc.com>2012-11-14 09:25:45 +0100
commit78ad74b167aabe9d3a8eebfd8e5632cdbe97c9d5 (patch)
tree84716c7d1ba510df5f119adf9518609ae45a3b13 /cpp/src/IceGrid/AdapterCache.cpp
parentminor fix to PropertiesAdmin.h (diff)
downloadice-78ad74b167aabe9d3a8eebfd8e5632cdbe97c9d5.tar.bz2
ice-78ad74b167aabe9d3a8eebfd8e5632cdbe97c9d5.tar.xz
ice-78ad74b167aabe9d3a8eebfd8e5632cdbe97c9d5.zip
Fixed IceGrid locator implementation to check for the client encoding
Diffstat (limited to 'cpp/src/IceGrid/AdapterCache.cpp')
-rw-r--r--cpp/src/IceGrid/AdapterCache.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/src/IceGrid/AdapterCache.cpp b/cpp/src/IceGrid/AdapterCache.cpp
index 3e6fa703aeb..e9e42e9024e 100644
--- a/cpp/src/IceGrid/AdapterCache.cpp
+++ b/cpp/src/IceGrid/AdapterCache.cpp
@@ -667,6 +667,7 @@ ReplicaGroupEntry::getLocatorAdapterInfo(LocatorAdapterInfoSeq& adapters, int& n
Lock sync(*this);
assert(_requestInProgress);
_requestInProgress = false;
+ notify();
}
throw;
}
@@ -676,6 +677,7 @@ ReplicaGroupEntry::getLocatorAdapterInfo(LocatorAdapterInfoSeq& adapters, int& n
Lock sync(*this);
assert(_requestInProgress);
_requestInProgress = false;
+ notify();
if(unreachable > 0)
{
_lastReplica = (_lastReplica + unreachable) % static_cast<int>(_replicas.size());