diff options
| author | Michi Henning <michi@zeroc.com> | 2008-10-17 17:04:16 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2008-10-17 17:04:16 +1000 |
| commit | 4259685e44589a6efbb45f43f054b406dc8cf89c (patch) | |
| tree | d3e26a8201d782e4cd4f617c090cafe9e609d943 /cpp/src/IceGrid/NodeCache.cpp | |
| parent | Changed swish-e perl scripts to tolerate -IceTouch suffix and to avoid (diff) | |
| parent | Squashed commit of the following: (diff) | |
| download | ice-4259685e44589a6efbb45f43f054b406dc8cf89c.tar.bz2 ice-4259685e44589a6efbb45f43f054b406dc8cf89c.tar.xz ice-4259685e44589a6efbb45f43f054b406dc8cf89c.zip | |
Merge branch 'R3_3_branch'
Diffstat (limited to 'cpp/src/IceGrid/NodeCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeCache.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp index 812cb1977df..b9b8b478243 100644 --- a/cpp/src/IceGrid/NodeCache.cpp +++ b/cpp/src/IceGrid/NodeCache.cpp @@ -781,7 +781,10 @@ NodeEntry::checkSession() const while(_registering) { - wait(); + if(!timedWait(IceUtil::Time::seconds(5))) + { + break; // Consider the node down if it doesn't respond promptly. + } } if(!_session) |