diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-03-24 17:31:42 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-03-24 17:31:42 +0000 |
| commit | 83200b6de517b3634769090fd04523ab25a8942b (patch) | |
| tree | 8f380f4bdddd77c48167bc3eee0679d1107f0328 /cpp/src/IceGrid/ServerI.cpp | |
| parent | Fixed bug 916 (diff) | |
| download | ice-83200b6de517b3634769090fd04523ab25a8942b.tar.bz2 ice-83200b6de517b3634769090fd04523ab25a8942b.tar.xz ice-83200b6de517b3634769090fd04523ab25a8942b.zip | |
Fixed bug 885 and 920
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 2df872dd65a..ffc96e2e6fa 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -965,8 +965,6 @@ ServerI::checkDestroyed() void ServerI::disableOnFailure() { - assert(_state != Deactivating); // This must be called before switching to the Deactivating state. - // // If the server is already disabled, nothing to do. // @@ -980,7 +978,7 @@ ServerI::disableOnFailure() // is always and the server wasn't active at the time of the // failure we disable the server. // - if(_disableOnFailure != 0 || _activation == Always && _state != Active) + if(_disableOnFailure != 0 || _activation == Always && (_state == Activating || _state == WaitForActivation)) { _previousActivation = _activation; _activation = Disabled; |