Fixed ICE-5458: Locator::getRegistry now returns a replicated proxy

1 files changed, 6 insertions, 5 deletions

diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp
index 0a0add3df0d..2fef3c8c1e3 100644
--- a/cpp/src/IceGrid/LocatorI.cpp
+++ b/cpp/src/IceGrid/LocatorI.cpp
@@ -10,6 +10,7 @@
 #include <Ice/Ice.h>
 #include <IceGrid/LocatorI.h>
 #include <IceGrid/Database.h>
+#include <IceGrid/WellKnownObjectsManager.h>
 #include <IceGrid/SessionI.h>
 #include <IceGrid/Util.h>
 
@@ -813,12 +814,12 @@ private:
 
 LocatorI::LocatorI(const Ice::CommunicatorPtr& communicator, 
                    const DatabasePtr& database, 
-                   const Ice::LocatorRegistryPrx& locatorRegistry,
+                   const WellKnownObjectsManagerPtr& wellKnownObjects,
                    const RegistryPrx& registry,
                    const QueryPrx& query) :
-    _communicator(communicator),
-    _database(database),
-    _locatorRegistry(locatorRegistry),
+    _communicator(communicator), 
+    _database(database), 
+    _wellKnownObjects(wellKnownObjects), 
     _localRegistry(registry),
     _localQuery(query)
 {
@@ -933,7 +934,7 @@ LocatorI::findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr& cb,
 Ice::LocatorRegistryPrx
 LocatorI::getRegistry(const Ice::Current&) const
 {
-    return _locatorRegistry;
+    return _wellKnownObjects->getLocatorRegistry();
 }
 
 RegistryPrx