summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2009-08-07 01:53:44 +0000
committerAndrew Stitcher <astitcher@apache.org>2009-08-07 01:53:44 +0000
commit038e48fa0110f682806e34e34a22ab75c6f51da9 (patch)
treef99a291cf7f1eb968e10d4ff3f902f3b3d0c4128 /cpp/src
parent2f165c49deaf4a18ac2d066a4199df1dd3ac0c3c (diff)
downloadqpid-python-038e48fa0110f682806e34e34a22ab75c6f51da9.tar.gz
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/qpid@801859 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/broker/Broker.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index e7027bfc90..8b6cb5e049 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/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();