diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-03-27 10:47:51 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-03-27 10:47:51 +0000 |
| commit | ff4f87e8c6aa40b54d1c639f8f61554d879de30e (patch) | |
| tree | 8ef7f24d16af63a9c41c39202e2a060a8c8f30c0 /cpp/src | |
| parent | regenerated properties (diff) | |
| download | ice-ff4f87e8c6aa40b54d1c639f8f61554d879de30e.tar.bz2 ice-ff4f87e8c6aa40b54d1c639f8f61554d879de30e.tar.xz ice-ff4f87e8c6aa40b54d1c639f8f61554d879de30e.zip | |
Fixed bug 881
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index ffc96e2e6fa..8538bd634c9 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -1840,7 +1840,12 @@ ServerI::setStateNoSync(InternalServerState st, const std::string& reason) } } - if(toServerState(previous) != toServerState(_state)) + // + // Don't send the server update if the state didn't change or if + // the server couldn't be forked. + // + if(toServerState(previous) != toServerState(_state) && + !(previous == Inactive && _state == Deactivating)) { NodeObserverPrx observer = _node->getObserver(); if(observer) |