diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-06-13 23:41:52 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-06-13 23:41:52 +0200 |
| commit | 9f0daf4da1e7f6568693e9771ae942826838ee1a (patch) | |
| tree | d3f110aa60c1df14ff77dc5973dc588f44b9b4e0 /cpp/src/Ice/ConnectionFactory.cpp | |
| parent | Java & Android test fixes (diff) | |
| download | ice-9f0daf4da1e7f6568693e9771ae942826838ee1a.tar.bz2 ice-9f0daf4da1e7f6568693e9771ae942826838ee1a.tar.xz ice-9f0daf4da1e7f6568693e9771ae942826838ee1a.zip | |
Fix for ICE-8044 - adapterDeactivation test failure caused by deadlock
Diffstat (limited to 'cpp/src/Ice/ConnectionFactory.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionFactory.cpp | 14 |
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 |