On broker shutdown, re-join the timer thread outside of a locked scope to prevent deadlock.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@683619 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 17 insertions, 15 deletions

diff --git a/qpid/cpp/src/qpid/management/ManagementBroker.cpp b/qpid/cpp/src/qpid/management/ManagementBroker.cpp
index 6a3e61cfe4..1bdd8ab836 100644
--- a/qpid/cpp/src/qpid/management/ManagementBroker.cpp
+++ b/qpid/cpp/src/qpid/management/ManagementBroker.cpp
@@ -90,24 +90,26 @@ ManagementBroker::ManagementBroker () :
 
 ManagementBroker::~ManagementBroker ()
 {
-    Mutex::ScopedLock lock (userLock);
-
-    // Reset the shared pointers to exchanges.  If this is not done now, the exchanges
-    // will stick around until dExchange and mExchange are implicitely destroyed (long
-    // after this destructor completes).  Those exchanges hold references to management
-    // objects that will be invalid.
-    dExchange.reset();
-    mExchange.reset();
     timer.stop();
+    {
+        Mutex::ScopedLock lock (userLock);
 
-    moveNewObjectsLH();
-    for (ManagementObjectMap::iterator iter = managementObjects.begin ();
-         iter != managementObjects.end ();
-         iter++) {
-        ManagementObject* object = iter->second;
-        delete object;
+        // Reset the shared pointers to exchanges.  If this is not done now, the exchanges
+        // will stick around until dExchange and mExchange are implicitely destroyed (long
+        // after this destructor completes).  Those exchanges hold references to management
+        // objects that will be invalid.
+        dExchange.reset();
+        mExchange.reset();
+
+        moveNewObjectsLH();
+        for (ManagementObjectMap::iterator iter = managementObjects.begin ();
+             iter != managementObjects.end ();
+             iter++) {
+            ManagementObject* object = iter->second;
+            delete object;
+        }
+        managementObjects.clear();
     }
-    managementObjects.clear();
 }
 
 void ManagementBroker::configure(string _dataDir, uint16_t _interval, Manageable* _broker, int _threads)