diff options
author | Benoit Foucher <benoit@zeroc.com> | 2013-08-28 17:56:33 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2013-08-28 17:56:33 +0200 |
commit | 08cb802bb321d6a92323792d4f0dbefe13d87032 (patch) | |
tree | 07a487d26275ce136e8dee0d12422d2afe2498b5 /cpp/src/IceGrid/RegistryI.h | |
parent | makedist.py fixes (diff) | |
download | ice-08cb802bb321d6a92323792d4f0dbefe13d87032.tar.bz2 ice-08cb802bb321d6a92323792d4f0dbefe13d87032.tar.xz ice-08cb802bb321d6a92323792d4f0dbefe13d87032.zip |
Fix for ICE-5357: improved discovery of replicas on node/slave startup
Diffstat (limited to 'cpp/src/IceGrid/RegistryI.h')
-rw-r--r-- | cpp/src/IceGrid/RegistryI.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/RegistryI.h b/cpp/src/IceGrid/RegistryI.h index 8595536e48c..74b1fc835cb 100644 --- a/cpp/src/IceGrid/RegistryI.h +++ b/cpp/src/IceGrid/RegistryI.h @@ -95,7 +95,9 @@ private: Glacier2::SSLPermissionsVerifierPrx getSSLPermissionsVerifier(const LocatorPrx&, const std::string&); Glacier2::SSLInfo getSSLInfo(const Ice::ConnectionPtr&, std::string&); - NodePrxSeq registerReplicas(const InternalRegistryPrx&, const InternalRegistryPrxSeq&, const NodePrxSeq&); + NodePrxSeq registerReplicas(const InternalRegistryPrx&, + const std::map<InternalRegistryPrx, RegistryPrx>&, + const NodePrxSeq&); void registerNodes(const InternalRegistryPrx&, const NodePrxSeq&); const Ice::CommunicatorPtr _communicator; |