diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2010-02-19 18:45:14 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2010-02-19 18:45:14 +0100 |
| commit | ea9a8bcfc079175205766491ab217e65536a656f (patch) | |
| tree | 8dd6cd069f9966bd59d72587052a42195d45cf63 /cpp/src/IceGrid/ServerI.cpp | |
| parent | added txt to ICE_LICENSE (diff) | |
| download | ice-ea9a8bcfc079175205766491ab217e65536a656f.tar.bz2 ice-ea9a8bcfc079175205766491ab217e65536a656f.tar.xz ice-ea9a8bcfc079175205766491ab217e65536a656f.zip | |
Fixed bug 4677 - IceGrid update hang
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 5085d411c69..a4c13044d2e 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -1085,7 +1085,7 @@ ServerI::load(const AMD_Node_loadServerPtr& amdCB, const InternalServerDescripto } return 0; } - + if(!StopCommand::isStopped(_state) && !_stop) { _stop = new StopCommand(this, _node->getTimer(), _deactivationTimeout); |