diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2010-01-21 11:06:39 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2010-01-21 11:06:39 +0100 |
| commit | 9d25d1e1d0286258b785fb2749a24e649e70604d (patch) | |
| tree | abe75e288942c3d111eec47a1cb5849f7ed9046d /cpp/src/IceGrid/SessionManager.h | |
| parent | 4615 - Change Vb Glacier2/callback demo to use Glacier2.Application (diff) | |
| download | ice-9d25d1e1d0286258b785fb2749a24e649e70604d.tar.bz2 ice-9d25d1e1d0286258b785fb2749a24e649e70604d.tar.xz ice-9d25d1e1d0286258b785fb2749a24e649e70604d.zip | |
Fixed bug 3521 - Fixed bug where icegridnode would disconnect if clock moved backward
Diffstat (limited to 'cpp/src/IceGrid/SessionManager.h')
| -rw-r--r-- | cpp/src/IceGrid/SessionManager.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/SessionManager.h b/cpp/src/IceGrid/SessionManager.h index 61e9bd912cc..5b4adb095e7 100644 --- a/cpp/src/IceGrid/SessionManager.h +++ b/cpp/src/IceGrid/SessionManager.h @@ -103,12 +103,12 @@ public: { if(_state == Connected || action == Connect || action == KeepAlive) { - IceUtil::Time now = IceUtil::Time::now(); + IceUtil::Time now = IceUtil::Time::now(IceUtil::Time::Monotonic); IceUtil::Time wakeTime = now + timeout; while(_state != Destroyed && _nextAction == None && wakeTime > now) { timedWait(wakeTime - now); - now = IceUtil::Time::now(); + now = IceUtil::Time::now(IceUtil::Time::Monotonic); } } if(_nextAction == None) |