You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2009/08/07 03:53:56 UTC
svn commit: r801861 - in /qpid/trunk/qpid/cpp/src/qpid/broker:
LinkRegistry.cpp QueueCleaner.cpp QueueCleaner.h
Author: astitcher
Date: Fri Aug 7 01:53:56 2009
New Revision: 801861
URL: http://svn.apache.org/viewvc?rev=801861&view=rev
Log:
Change QueueCleaner so that it cancels any outstanding TimerTask on destruction
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/QueueCleaner.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/QueueCleaner.h
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp?rev=801861&r1=801860&r2=801861&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp Fri Aug 7 01:53:56 2009
@@ -68,7 +68,7 @@
{
links.periodicMaintenance ();
setupNextFire();
- links.timer->add (this);
+ links.timer->add(this);
}
void LinkRegistry::periodicMaintenance ()
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueueCleaner.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueueCleaner.cpp?rev=801861&r1=801860&r2=801861&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueueCleaner.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueueCleaner.cpp Fri Aug 7 01:53:56 2009
@@ -28,6 +28,11 @@
QueueCleaner::QueueCleaner(QueueRegistry& q, sys::Timer& t) : queues(q), timer(t) {}
+QueueCleaner::~QueueCleaner()
+{
+ task->cancel();
+}
+
void QueueCleaner::start(qpid::sys::Duration p)
{
task = new Task(*this, p);
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueueCleaner.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueueCleaner.h?rev=801861&r1=801860&r2=801861&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueueCleaner.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueueCleaner.h Fri Aug 7 01:53:56 2009
@@ -36,6 +36,7 @@
{
public:
QPID_BROKER_EXTERN QueueCleaner(QueueRegistry& queues, sys::Timer& timer);
+ QPID_BROKER_EXTERN ~QueueCleaner();
QPID_BROKER_EXTERN void start(qpid::sys::Duration period);
private:
class Task : public sys::TimerTask
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org