From 91f6ebb998532b36fc70187b641a5b7404060422 Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Tue, 3 Sep 2013 15:42:19 +0200 Subject: Fixed ICE-5358 - allow IceGrid replica to initialize its database from another replica --- cpp/src/IceGrid/NodeSessionManager.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'cpp/src/IceGrid/NodeSessionManager.cpp') diff --git a/cpp/src/IceGrid/NodeSessionManager.cpp b/cpp/src/IceGrid/NodeSessionManager.cpp index fd3ddfc51ed..66191878052 100644 --- a/cpp/src/IceGrid/NodeSessionManager.cpp +++ b/cpp/src/IceGrid/NodeSessionManager.cpp @@ -227,7 +227,8 @@ NodeSessionKeepAliveThread::keepAlive(const NodeSessionPrx& session) } } -NodeSessionManager::NodeSessionManager() : +NodeSessionManager::NodeSessionManager(const Ice::CommunicatorPtr& communicator) : + SessionManager(communicator), _destroyed(false), _activated(false) { @@ -239,22 +240,7 @@ NodeSessionManager::create(const NodeIPtr& node) { Lock sync(*this); assert(!_node); - const_cast(_node) = node; - - Ice::CommunicatorPtr communicator = _node->getCommunicator(); - assert(communicator->getDefaultLocator()); - - // - // Initialize query objects from the default locator endpoints. - // - initQueryObjects(communicator->getDefaultLocator()); - - Ice::ObjectPrx prx = communicator->getDefaultLocator(); - Ice::Identity id = prx->ice_getIdentity(); - id.name = "InternalRegistry-Master"; - _master = InternalRegistryPrx::uncheckedCast(prx->ice_identity(id)->ice_endpoints(Ice::EndpointSeq())); - _thread = new Thread(*this); _thread->start(); } -- cgit v1.2.3