summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/IceGridNode.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2011-04-07 13:48:24 +0200
committerBenoit Foucher <benoit@zeroc.com>2011-04-07 13:48:24 +0200
commit397efc73c7a3c2660b6cb567a13a9a87d2c388e9 (patch)
tree68d2888101b951bb582b1d60c61fc75ba4328010 /cpp/src/IceGrid/IceGridNode.cpp
parentBug 4720 - Improved AsyncResult to allow throwing local exception is request ... (diff)
downloadice-397efc73c7a3c2660b6cb567a13a9a87d2c388e9.tar.bz2
ice-397efc73c7a3c2660b6cb567a13a9a87d2c388e9.tar.xz
ice-397efc73c7a3c2660b6cb567a13a9a87d2c388e9.zip
Fixed bug 4818 - IceGrid node startup hang
Diffstat (limited to 'cpp/src/IceGrid/IceGridNode.cpp')
-rw-r--r--cpp/src/IceGrid/IceGridNode.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp
index ebb75307ba6..0c24b39c36b 100644
--- a/cpp/src/IceGrid/IceGridNode.cpp
+++ b/cpp/src/IceGrid/IceGridNode.cpp
@@ -495,7 +495,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
{
try
{
- communicator()->getDefaultLocator()->ice_timeout(15000)->ice_ping();
+ communicator()->getDefaultLocator()->ice_timeout(1000)->ice_ping();
}
catch(const Ice::LocalException& ex)
{