diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-09-03 15:42:19 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-09-03 15:42:19 +0200 |
| commit | 91f6ebb998532b36fc70187b641a5b7404060422 (patch) | |
| tree | ac88e961c68e4b09eb819f4b57b9ecac56854567 /cpp/src/IceGrid/RegistryI.h | |
| parent | ICE-5378 - Remove slice35d.dll from Windows installer (diff) | |
| download | ice-91f6ebb998532b36fc70187b641a5b7404060422.tar.bz2 ice-91f6ebb998532b36fc70187b641a5b7404060422.tar.xz ice-91f6ebb998532b36fc70187b641a5b7404060422.zip | |
Fixed ICE-5358 - allow IceGrid replica to initialize its database from another replica
Diffstat (limited to 'cpp/src/IceGrid/RegistryI.h')
| -rw-r--r-- | cpp/src/IceGrid/RegistryI.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/RegistryI.h b/cpp/src/IceGrid/RegistryI.h index 74b1fc835cb..1eb81d757c1 100644 --- a/cpp/src/IceGrid/RegistryI.h +++ b/cpp/src/IceGrid/RegistryI.h @@ -50,7 +50,7 @@ class RegistryI : public Registry { public: - RegistryI(const Ice::CommunicatorPtr&, const TraceLevelsPtr&, bool, bool); + RegistryI(const Ice::CommunicatorPtr&, const TraceLevelsPtr&, bool, bool, const std::string&); ~RegistryI(); bool start(); @@ -95,15 +95,14 @@ private: Glacier2::SSLPermissionsVerifierPrx getSSLPermissionsVerifier(const LocatorPrx&, const std::string&); Glacier2::SSLInfo getSSLInfo(const Ice::ConnectionPtr&, std::string&); - NodePrxSeq registerReplicas(const InternalRegistryPrx&, - const std::map<InternalRegistryPrx, RegistryPrx>&, - const NodePrxSeq&); + NodePrxSeq registerReplicas(const InternalRegistryPrx&, const NodePrxSeq&); void registerNodes(const InternalRegistryPrx&, const NodePrxSeq&); const Ice::CommunicatorPtr _communicator; const TraceLevelsPtr _traceLevels; const bool _nowarn; const bool _readonly; + const std::string _initFromReplica; DatabasePtr _database; Ice::ObjectAdapterPtr _clientAdapter; |