Bug 3409 - add sequence checking to ruby/python

1 files changed, 12 insertions, 1 deletions

diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp
index 4cd06442f3b..7d866d3da2e 100644
--- a/cpp/src/Ice/LocatorInfo.cpp
+++ b/cpp/src/Ice/LocatorInfo.cpp
@@ -581,7 +581,18 @@ IceInternal::LocatorInfo::getLocatorRegistry()
     //
     // Do not make locator calls from within sync.
     //
-    LocatorRegistryPrx locatorRegistry = locator->getRegistry();
+    LocatorRegistryPrx locatorRegistry;
+    try
+    {
+        locatorRegistry = locator->getRegistry();
+    }
+    catch(const Ice::Exception&)
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+        notifyAll();
+
+        throw;
+    }
     
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);