Author: astitcher
Date: Fri Aug 7 03:14:20 2009
New Revision: 801871
URL: http://svn.apache.org/viewvc?rev=801871&view=rev
Log:
Fixed LinkRegistry destructor to only cancel TimerTask if there is one!
(the only time there might not be one is in the store tests)
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp
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=801871&r1=801870&r2=801871&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp Fri Aug 7 03:14:20
2009
@@ -58,7 +58,9 @@
LinkRegistry::~LinkRegistry()
{
- maintenanceTask->cancel();
+ // This test is only necessary if the default constructor above is present
+ if (maintenanceTask)
+ maintenanceTask->cancel();
}
LinkRegistry::Periodic::Periodic (LinkRegistry& _links) :
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
