diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2009-07-13 15:00:58 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2009-07-13 15:00:58 +0000 |
| commit | 15daf8342812786490f8a8dabcc5ba3cee8593e6 (patch) | |
| tree | 69ce95f978a7c6b7cfded0f025ffce7b1dd5d220 /cpp/src/qpid/broker/LinkRegistry.cpp | |
| parent | b7ec99208bb38dc0cad3a7fd42b8e652610a192a (diff) | |
| download | qpid-python-15daf8342812786490f8a8dabcc5ba3cee8593e6.tar.gz | |
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
Diffstat (limited to 'cpp/src/qpid/broker/LinkRegistry.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/LinkRegistry.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cpp/src/qpid/broker/LinkRegistry.cpp b/cpp/src/qpid/broker/LinkRegistry.cpp index a82e828138..c6e10f0f8c 100644 --- a/cpp/src/qpid/broker/LinkRegistry.cpp +++ b/cpp/src/qpid/broker/LinkRegistry.cpp @@ -36,12 +36,10 @@ namespace _qmf = qmf::org::apache::qpid::broker; #define LINK_MAINT_INTERVAL 2 -LinkRegistry::LinkRegistry (Broker* _broker) : - broker(_broker), timer(broker->getTimer()), - parent(0), store(0), passive(false), passiveChanged(false), - realm(broker ? broker->getOptions().realm : "") +LinkRegistry::LinkRegistry (Broker* _broker) : broker(_broker), parent(0), store(0), passive(false), passiveChanged(false), + realm(broker ? broker->getOptions().realm : "") { - timer.add (new Periodic(*this)); + timer.add (intrusive_ptr<TimerTask> (new Periodic(*this))); } LinkRegistry::Periodic::Periodic (LinkRegistry& _links) : @@ -50,7 +48,7 @@ LinkRegistry::Periodic::Periodic (LinkRegistry& _links) : void LinkRegistry::Periodic::fire () { links.periodicMaintenance (); - links.timer.add (new Periodic(links)); + links.timer.add (intrusive_ptr<TimerTask> (new Periodic(links))); } void LinkRegistry::periodicMaintenance () |