summaryrefslogtreecommitdiff
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
commit5b56e3b8e41cba9314808ec1bd0d85cd771ef3f3 (patch)
tree65e830d95e81a82d38ec7f07277337e0d47c7d46
parent13fc21a1dcb89cda44d0a8fad86882bb64f89b49 (diff)
downloadqpid-python-5b56e3b8e41cba9314808ec1bd0d85cd771ef3f3.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@801859 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/broker/Broker.cpp4
1 files changed, 0 insertions, 4 deletions
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();