summaryrefslogtreecommitdiff
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
commit5eb5617fa353bc2ef0b8ab829477706b4e188fb1 (patch)
tree287981893626dd3cef150f51f4c64e6669c455eb
parent4709023cd20ef4cac35061e0fd239194c6f36641 (diff)
downloadqpid-python-5eb5617fa353bc2ef0b8ab829477706b4e188fb1.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@801802 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/broker/Broker.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp
index 8b6cb5e049..e7027bfc90 100644
--- a/qpid/cpp/src/qpid/broker/Broker.cpp
+++ b/qpid/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();