From 25daee96ab3b986711db0cee5d1d61a3dc1907cc Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Tue, 13 Jun 2017 11:10:33 +0200
Subject: Fix for ICE-8015 - clear ACM monitor connections from the timer
 thread

---
 cpp/src/Ice/ACM.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cpp/src/Ice/ACM.cpp')

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;
         }
 
-- 
cgit v1.2.3