diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-01-10 10:03:50 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-01-10 10:03:50 +0000 |
| commit | 5fe4b256674f054a52e73084ef2111afbef8fa8b (patch) | |
| tree | fc9b4ffd89d7b4f0876fcdb2ebb1b25e813f3129 /cpp/src/IceGrid/ServerI.cpp | |
| parent | Mac OS X fix (diff) | |
| download | ice-5fe4b256674f054a52e73084ef2111afbef8fa8b.tar.bz2 ice-5fe4b256674f054a52e73084ef2111afbef8fa8b.tar.xz ice-5fe4b256674f054a52e73084ef2111afbef8fa8b.zip | |
Fix
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 20c50f79d23..1c0ef752ac7 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -1825,7 +1825,8 @@ ServerI::setStateNoSync(InternalServerState st, const std::string& reason) _timer = new DelayedStart(this); _node->getWaitQueue()->add(_timer, IceUtil::Time::seconds(_disableOnFailure)); } - else if(_state == Inactive && _activation == Always && previous != Activating && previous != ActivationTimeout) + else if(_state == Inactive && _activation == Always && + previous != Activating && previous != ActivationTimeout && previous != WaitForActivation) { if(!_start) { |