From 449d9d326b7cea02934c3e7e8ea7e84a817e47ac Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 17 Feb 2009 20:18:38 +0000 Subject: Minor fixes. client/SubscriptionManager: made it thread safe, was causing latencytest to crash with --rate and --time-limit. cluster/Cluster.cpp: don't call cpg_leave during shutdown. Not required and a problem if shutdown was caused by a cpg error. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@745226 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/cluster/Cluster.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'cpp/src/qpid/cluster') diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp index f845492dbc..6221b0054c 100644 --- a/cpp/src/qpid/cluster/Cluster.cpp +++ b/cpp/src/qpid/cluster/Cluster.cpp @@ -193,10 +193,6 @@ void Cluster::leave(Lock&) { if (state != LEFT) { state = LEFT; QPID_LOG(notice, *this << " leaving cluster " << name); - try { cpg.leave(); } - catch (const std::exception& e) { - QPID_LOG(critical, *this << " error leaving process group: " << e.what()); - } connections.clear(); try { broker.shutdown(); } catch (const std::exception& e) { @@ -371,7 +367,6 @@ void Cluster::tryMakeOffer(const MemberId& id, Lock& ) { // callbacks will be invoked. // void Cluster::brokerShutdown() { - QPID_LOG(notice, *this << " shutting down "); if (state != LEFT) { try { cpg.shutdown(); } catch (const std::exception& e) { -- cgit v1.2.1