diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-02-06 12:51:09 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-02-06 12:51:09 +0100 |
| commit | eb97ed50f2aa8f94198efccb1fe4d91390d9a334 (patch) | |
| tree | 6b20569420b0186a48445c371bafd058b7d817df /cpp/src/IceGrid/Activator.cpp | |
| parent | ICE-7359 - Fix usage of PyTuple_SET_ITEM (diff) | |
| download | ice-eb97ed50f2aa8f94198efccb1fe4d91390d9a334.tar.bz2 ice-eb97ed50f2aa8f94198efccb1fe4d91390d9a334.tar.xz ice-eb97ed50f2aa8f94198efccb1fe4d91390d9a334.zip | |
Fixed ICE-7428 - Potential IceGrid node crash on shutdown
Diffstat (limited to 'cpp/src/IceGrid/Activator.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Activator.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index ac7f7c3d349..1e4303f439b 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -1057,6 +1057,11 @@ void Activator::shutdown() { IceUtil::Monitor< IceUtil::Mutex>::Lock sync(*this); + if(_deactivating) + { + return; + } + // // Deactivation has been initiated. Set _deactivating to true to // prevent activation of new processes. This will also cause the |