summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2009-08-06 20:04:13 +0000
committerGordon Sim <gsim@apache.org>2009-08-06 20:04:13 +0000
commit97dbf7f64f85558d0b91bbb11f793ec896495bca (patch)
treef7e3132be09534e4ac4cafbccd70afb947ae0792 /cpp/src
parent1af1e0114b71a366dc78a47c3d63833f1a0b4c8a (diff)
downloadqpid-python-97dbf7f64f85558d0b91bbb11f793ec896495bca.tar.gz
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
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/broker/Broker.cpp4
1 files changed, 4 insertions, 0 deletions
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();