summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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();