diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-02-06 12:51:37 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-02-06 12:51:37 +0100 |
| commit | c5d667a8599e4644dc3816550983a8a6960e197a (patch) | |
| tree | ef87eb32b29d3c88b91fc690b117b887acce42ef /cpp/src/IceGrid/Activator.cpp | |
| parent | Fixed ICE-7554 - Ice/ami cross test failure, missing ObjC sleep impl (diff) | |
| parent | Fixed ICE-7428 - Potential IceGrid node crash on shutdown (diff) | |
| download | ice-c5d667a8599e4644dc3816550983a8a6960e197a.tar.bz2 ice-c5d667a8599e4644dc3816550983a8a6960e197a.tar.xz ice-c5d667a8599e4644dc3816550983a8a6960e197a.zip | |
Merge remote-tracking branch 'origin/3.6'
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 7e7224c142e..adc9dce5070 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 |