diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-06-13 11:10:33 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-06-13 11:10:33 +0200 |
| commit | 25daee96ab3b986711db0cee5d1d61a3dc1907cc (patch) | |
| tree | 6a5bb92effa70c227880bb590f8ace0bda707ead /cpp/src/Ice/ACM.cpp | |
| parent | Update assembley strog name public key token (diff) | |
| download | ice-25daee96ab3b986711db0cee5d1d61a3dc1907cc.tar.bz2 ice-25daee96ab3b986711db0cee5d1d61a3dc1907cc.tar.xz ice-25daee96ab3b986711db0cee5d1d61a3dc1907cc.zip | |
Fix for ICE-8015 - clear ACM monitor connections from the timer thread
Diffstat (limited to 'cpp/src/Ice/ACM.cpp')
| -rw-r--r-- | cpp/src/Ice/ACM.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/ACM.cpp b/cpp/src/Ice/ACM.cpp index 238791edfa1..9392df6aacc 100644 --- a/cpp/src/Ice/ACM.cpp +++ b/cpp/src/Ice/ACM.cpp @@ -95,7 +95,6 @@ IceInternal::FactoryACMMonitor::destroy() } _instance = 0; - _connections.clear(); _changes.clear(); } @@ -187,6 +186,7 @@ IceInternal::FactoryACMMonitor::runTimerTask() Lock sync(*this); if(!_instance) { + _connections.clear(); return; } |