1 files changed, 12 insertions, 2 deletions
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index 3e7bb1ea94b..6387075b97e 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -219,8 +219,13 @@ IceInternal::OutgoingConnectionFactory::waitUntilFinished()
         cons.clear();
         _connections.clear();
         _connectionsByEndpoint.clear();
-        _monitor->destroy();
     }
+
+    //
+    // Must be destroyed outside the synchronization since this might block waiting for
+    // a timer task to complete.
+    //
+    _monitor->destroy();
 }
 
 void
@@ -1251,8 +1256,13 @@ IceInternal::IncomingConnectionFactory::waitUntilFinished()
             cons.clear();
         }
         _connections.clear();
-        _monitor->destroy();
     }
+
+    //
+    // Must be destroyed outside the synchronization since this might block waiting for
+    // a timer task to complete.
+    //
+    _monitor->destroy();
 }
 
 bool