Bug 3966 - deadlock in LocatorInfo

1 files changed, 2 insertions, 1 deletions

diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h
index 2d44d050a4a..cfc8e2c22ba 100644
--- a/cpp/src/Ice/LocatorInfo.h
+++ b/cpp/src/Ice/LocatorInfo.h
@@ -73,7 +73,7 @@ private:
     std::map<Ice::Identity, std::pair<IceUtil::Time, ReferencePtr> > _objectMap;
 };
 
-class LocatorInfo : public IceUtil::Shared, public IceUtil::Mutex
+class LocatorInfo : public IceUtil::Shared, public IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
 
@@ -175,6 +175,7 @@ private:
     Ice::LocatorRegistryPrx _locatorRegistry;
     const LocatorTablePtr _table;
     const bool _background;
+    bool _waitForRegistry;
 
     std::map<std::string, RequestPtr> _adapterRequests;
     std::map<Ice::Identity, RequestPtr> _objectRequests;