diff options
| author | Alan Conway <aconway@apache.org> | 2010-02-26 16:47:23 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-02-26 16:47:23 +0000 |
| commit | 381ff27cacc1f72a42504e8e698d33b59d145b30 (patch) | |
| tree | edacbecabda74ac97d788e76d0071dfb5458618e /cpp/src/qpid/cluster/Cluster.cpp | |
| parent | eecd6b99d4db4b83ba3edd2cbad4bfa08a4bfec8 (diff) | |
| download | qpid-python-381ff27cacc1f72a42504e8e698d33b59d145b30.tar.gz | |
Fix cluster abort on shutdown in ClusterTimer::fire.
The cluster destructor was not deleting the ClusterTimer set on the
broker, so this timer had a dangling pointer to the cluster.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@916751 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster/Cluster.cpp')
| -rw-r--r-- | cpp/src/qpid/cluster/Cluster.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp index 08646e5a6b..f49fbb03a5 100644 --- a/cpp/src/qpid/cluster/Cluster.cpp +++ b/cpp/src/qpid/cluster/Cluster.cpp @@ -285,6 +285,7 @@ Cluster::Cluster(const ClusterSettings& set, broker::Broker& b) : } Cluster::~Cluster() { + broker.setClusterTimer(std::auto_ptr<sys::Timer>(0)); // Delete cluster timer if (updateThread.id()) updateThread.join(); // Join the previous updatethread. } @@ -1002,7 +1003,6 @@ void Cluster::errorCheck(const MemberId& from, uint8_t type, framing::SequenceNu } void Cluster::timerWakeup(const MemberId& , const std::string& name, Lock&) { - QPID_LOG(debug, "Cluster timer wakeup " << map.getFrameSeq() << ": " << name) timer->deliverWakeup(name); } |