From 97dbf7f64f85558d0b91bbb11f793ec896495bca Mon Sep 17 00:00:00 2001
From: Gordon Sim <gsim@apache.org>
Date: Thu, 6 Aug 2009 20:04:13 +0000
Subject: Stop timer thread before users are deleted (as they don't all clean
 up prior to being destroyed)

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@801802 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/broker/Broker.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'cpp')

diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 8b6cb5e049..e7027bfc90 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -334,6 +334,10 @@ void Broker::shutdown() {
 Broker::~Broker() {
     shutdown();
     queueEvents.shutdown();
+    //TODO: timer clients should really remove any registered tasks
+    //before the are destroyed; until that is the case, this prevents
+    //their failure to do from crashing the broker
+    timer.stop();
     finalize();                 // Finalize any plugins.
     if (config.auth)
         SaslAuthenticator::fini();
-- 
cgit v1.2.1