From 5b56e3b8e41cba9314808ec1bd0d85cd771ef3f3 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Fri, 7 Aug 2009 01:53:44 +0000 Subject: Revert "Stop timer thread before users are deleted (as they don't all clean up prior to being destroyed)" This reverts commit cfbbe6093b1353f3896249d227cf1458d95abbc7. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@801859 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/broker/Broker.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'qpid/cpp/src') diff --git a/qpid/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp index e7027bfc90..8b6cb5e049 100644 --- a/qpid/cpp/src/qpid/broker/Broker.cpp +++ b/qpid/cpp/src/qpid/broker/Broker.cpp @@ -334,10 +334,6 @@ 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