diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2007-09-25 18:12:47 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2007-09-25 18:12:47 +0200 |
| commit | 96e45b30cd3dda2a13a029ef564a786a3546f316 (patch) | |
| tree | 97f4d030a2d8f8555cb4ed3b6d80802d80cda283 /cpp/src/IceGrid/ServerI.cpp | |
| parent | Fixed missing assignment (diff) | |
| parent | Fixed bug 2480 & 2481 (diff) | |
| download | ice-96e45b30cd3dda2a13a029ef564a786a3546f316.tar.bz2 ice-96e45b30cd3dda2a13a029ef564a786a3546f316.tar.xz ice-96e45b30cd3dda2a13a029ef564a786a3546f316.zip | |
Merge branch 'timer-fixes'
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 072c76d30ad..f7dcfa7ea67 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -346,7 +346,7 @@ void TimedServerCommand::startTimer() { _timerTask = new CommandTimeoutTimerTask(this); - _timer->schedule(_timerTask, IceUtil::Time::now(IceUtil::Time::Monotonic) + IceUtil::Time::seconds(_timeout)); + _timer->schedule(_timerTask, IceUtil::Time::seconds(_timeout)); } void @@ -2505,8 +2505,7 @@ ServerI::setStateNoSync(InternalServerState st, const std::string& reason) if(_activation == Always) { _timerTask = new DelayedStart(this, _node->getTraceLevels()); - _node->getTimer()->schedule(_timerTask, IceUtil::Time::now(IceUtil::Time::Monotonic) + - IceUtil::Time::milliSeconds(500)); + _node->getTimer()->schedule(_timerTask, IceUtil::Time::milliSeconds(500)); } else if(_activation == Disabled && _disableOnFailure > 0 && _failureTime != IceUtil::Time()) { @@ -2518,7 +2517,7 @@ ServerI::setStateNoSync(InternalServerState st, const std::string& reason) // callback is executed. // _timerTask = new DelayedStart(this, _node->getTraceLevels()); - _node->getTimer()->schedule(_timerTask, IceUtil::Time::now(IceUtil::Time::Monotonic) + + _node->getTimer()->schedule(_timerTask, IceUtil::Time::seconds(_disableOnFailure) + IceUtil::Time::milliSeconds(500)); } } |