From 15daf8342812786490f8a8dabcc5ba3cee8593e6 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Mon, 13 Jul 2009 15:00:58 +0000 Subject: Reverted checkins 793119, 793120, 793121, 793122 because of problems with heartbeats and the store tests. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@793602 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/QueueCleaner.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cpp/src/qpid/broker/QueueCleaner.cpp') diff --git a/cpp/src/qpid/broker/QueueCleaner.cpp b/cpp/src/qpid/broker/QueueCleaner.cpp index 814eca6751..0774dce2b7 100644 --- a/cpp/src/qpid/broker/QueueCleaner.cpp +++ b/cpp/src/qpid/broker/QueueCleaner.cpp @@ -26,15 +26,15 @@ namespace qpid { namespace broker { -QueueCleaner::QueueCleaner(QueueRegistry& q, sys::Timer& t) : queues(q), timer(t) {} +QueueCleaner::QueueCleaner(QueueRegistry& q, Timer& t) : queues(q), timer(t) {} void QueueCleaner::start(qpid::sys::Duration p) { - task = new Task(*this, p); + task = boost::intrusive_ptr(new Task(*this, p)); timer.add(task); } -QueueCleaner::Task::Task(QueueCleaner& p, qpid::sys::Duration d) : sys::TimerTask(d), parent(p) {} +QueueCleaner::Task::Task(QueueCleaner& p, qpid::sys::Duration d) : TimerTask(d), parent(p) {} void QueueCleaner::Task::fire() { @@ -44,7 +44,7 @@ void QueueCleaner::Task::fire() void QueueCleaner::fired() { queues.eachQueue(boost::bind(&Queue::purgeExpired, _1)); - task->setupNextFire(); + task->reset(); timer.add(task); } -- cgit v1.2.1