diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-10-14 12:55:46 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-10-14 12:58:58 +0200 |
| commit | d87cf8ef07bd13cf4bdeef88c7d75fe9c2593972 (patch) | |
| tree | e0cd124ba9820e2740bcf199954457be7d30319e /cpp/src/IceGrid/LocatorI.h | |
| parent | Added interrupt test for retry sleeps (diff) | |
| download | ice-d87cf8ef07bd13cf4bdeef88c7d75fe9c2593972.tar.bz2 ice-d87cf8ef07bd13cf4bdeef88c7d75fe9c2593972.tar.xz ice-d87cf8ef07bd13cf4bdeef88c7d75fe9c2593972.zip | |
Fixed ICE-5458: Locator::getRegistry now returns a replicated proxy
Diffstat (limited to 'cpp/src/IceGrid/LocatorI.h')
| -rw-r--r-- | cpp/src/IceGrid/LocatorI.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/LocatorI.h b/cpp/src/IceGrid/LocatorI.h index 7753b0232db..85228263d9f 100644 --- a/cpp/src/IceGrid/LocatorI.h +++ b/cpp/src/IceGrid/LocatorI.h @@ -20,6 +20,9 @@ namespace IceGrid class Database; typedef IceUtil::Handle<Database> DatabasePtr; + +class WellKnownObjectsManager; +typedef IceUtil::Handle<WellKnownObjectsManager> WellKnownObjectsManagerPtr; class LocatorI; typedef IceUtil::Handle<LocatorI> LocatorIPtr; @@ -45,7 +48,7 @@ public: }; typedef IceUtil::Handle<Request> RequestPtr; - LocatorI(const Ice::CommunicatorPtr&, const DatabasePtr&, const Ice::LocatorRegistryPrx&, const RegistryPrx&, + LocatorI(const Ice::CommunicatorPtr&, const DatabasePtr&, const WellKnownObjectsManagerPtr&, const RegistryPrx&, const QueryPrx&); virtual void findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr&, const Ice::Identity&, @@ -69,7 +72,7 @@ protected: const Ice::CommunicatorPtr _communicator; const DatabasePtr _database; - const Ice::LocatorRegistryPrx _locatorRegistry; + const WellKnownObjectsManagerPtr _wellKnownObjects; const RegistryPrx _localRegistry; const QueryPrx _localQuery; |