summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/RegistryI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceGrid/RegistryI.cpp')
-rw-r--r--cpp/src/IceGrid/RegistryI.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index ff0886ba67e..e059519cbc0 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -1177,9 +1177,6 @@ RegistryI::registerReplicas(const InternalRegistryPrx& internalRegistry,
set<NodePrx> nodes;
nodes.insert(dbNodes.begin(), dbNodes.end());
- int timeout =
- _communicator->getProperties()->getPropertyAsIntWithDefault("IceGrid.Registry.ReplicaSessionTimeout", 30);
-
for(InternalRegistryPrxSeq::const_iterator r = replicas.begin(); r != replicas.end(); ++r)
{
if((*r)->ice_getIdentity() != internalRegistry->ice_getIdentity())
@@ -1201,7 +1198,6 @@ RegistryI::registerReplicas(const InternalRegistryPrx& internalRegistry,
try
{
- InternalRegistryPrx replica = InternalRegistryPrx::uncheckedCast((*r)->ice_timeout(timeout * 1000));
(*r)->registerWithReplica(internalRegistry);
NodePrxSeq nds = (*r)->getNodes();
nodes.insert(nds.begin(), nds.end());
@@ -1252,15 +1248,12 @@ RegistryI::registerNodes(const InternalRegistryPrx& internalRegistry, const Node
{
const string prefix("Node-");
- int timeout =
- _communicator->getProperties()->getPropertyAsIntWithDefault("IceGrid.Registry.NodeSessionTimeout", 30);
for(NodePrxSeq::const_iterator p = nodes.begin(); p != nodes.end(); ++p)
{
assert((*p)->ice_getIdentity().name.find(prefix) != string::npos);
try
{
- NodePrx node = NodePrx::uncheckedCast((*p)->ice_timeout(timeout * 1000));
- _database->getNode((*p)->ice_getIdentity().name.substr(prefix.size()))->setProxy(node);
+ _database->getNode((*p)->ice_getIdentity().name.substr(prefix.size()))->setProxy(*p);
}
catch(const NodeNotExistException&)
{