diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2011-04-07 13:48:24 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2011-04-07 13:48:24 +0200 |
| commit | 397efc73c7a3c2660b6cb567a13a9a87d2c388e9 (patch) | |
| tree | 68d2888101b951bb582b1d60c61fc75ba4328010 /cpp/src/IceGrid/SessionManager.h | |
| parent | Bug 4720 - Improved AsyncResult to allow throwing local exception is request ... (diff) | |
| download | ice-397efc73c7a3c2660b6cb567a13a9a87d2c388e9.tar.bz2 ice-397efc73c7a3c2660b6cb567a13a9a87d2c388e9.tar.xz ice-397efc73c7a3c2660b6cb567a13a9a87d2c388e9.zip | |
Fixed bug 4818 - IceGrid node startup hang
Diffstat (limited to 'cpp/src/IceGrid/SessionManager.h')
| -rw-r--r-- | cpp/src/IceGrid/SessionManager.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/SessionManager.h b/cpp/src/IceGrid/SessionManager.h index 5b4adb095e7..2751fdbcdc5 100644 --- a/cpp/src/IceGrid/SessionManager.h +++ b/cpp/src/IceGrid/SessionManager.h @@ -56,7 +56,7 @@ public: { TPrx session; InternalRegistryPrx registry; - IceUtil::Time timeout = IceUtil::Time::seconds(15); + IceUtil::Time timeout = IceUtil::Time::seconds(10); Action action = Connect; try @@ -272,6 +272,13 @@ public: notifyAll(); } + bool + isDestroyed() + { + Lock sync(*this); + return _state == Destroyed; + } + TPrx getSession() { @@ -292,7 +299,7 @@ public: Lock sync(*this); return _registry; } - + virtual TPrx createSession(InternalRegistryPrx&, IceUtil::Time&) = 0; virtual void destroySession(const TPrx&) = 0; virtual bool keepAlive(const TPrx&) = 0; |