diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-04-12 19:01:56 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-04-12 19:01:56 +0200 |
| commit | 29d4ae478d63f9bc2945ba9f1ea33ccd7ea3c738 (patch) | |
| tree | 489a434ebcebb8a5904418bf0f662f405bc43c0f /cpp | |
| parent | UWP test script updates (diff) | |
| download | ice-29d4ae478d63f9bc2945ba9f1ea33ccd7ea3c738.tar.bz2 ice-29d4ae478d63f9bc2945ba9f1ea33ccd7ea3c738.tar.xz ice-29d4ae478d63f9bc2945ba9f1ea33ccd7ea3c738.zip | |
Fixed ICE-7726 - fixed IceGrid node bug which was causing IceGrid/noRestartUpdate test failure
Diffstat (limited to '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 9e652cebd4e..6168080c3dc 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -756,7 +756,8 @@ StopCommand::StopCommand(const ServerIPtr& server, const IceUtil::TimerPtr& time bool StopCommand::isStopped(ServerI::InternalServerState state) { - return state == ServerI::Inactive || state == ServerI::Patching || state == ServerI::Loading; + return state == ServerI::Inactive || state == ServerI::Patching || state == ServerI::Loading || + state >= ServerI::Destroying; } bool |