cluster:]

 - call updateMemberStats() exactly once for each change in cluster membership.
 - fix spurious replication of catch-up connection close events.
Removed unused client/MessageQueue.h


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@699456 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 3 deletions

diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp
index c1775616a8..9cd8d1842c 100644
--- a/cpp/src/qpid/cluster/Cluster.cpp
+++ b/cpp/src/qpid/cluster/Cluster.cpp
@@ -248,7 +248,7 @@ void Cluster::configChange(
     cpg_address *joined, int nJoined)
 {
     Mutex::ScopedLock l(lock);
-    QPID_LOG(debug, "CPG members: " << AddrList(current, nCurrent) 
+    QPID_LOG(debug, "Process members: " << AddrList(current, nCurrent) 
              << AddrList(left, nLeft, "( ", ")"));
     
     if (find(left, left+nLeft, self) != left+nLeft) { 
@@ -258,7 +258,7 @@ void Cluster::configChange(
         return;
     }
     
-    map.left(left, nLeft);
+    if (map.left(left, nLeft)) updateMemberStats();
     handler->configChange(current, nCurrent, left, nLeft, joined, nJoined);
 }
 
@@ -326,7 +326,7 @@ void Cluster::stopFullCluster(void) {
     mcastControl(ClusterShutdownBody(), 0);
 }
 
-void Cluster::updateMemberStats(void) {
+void Cluster::updateMemberStats() {
     if (mgmtObject) {
         mgmtObject->set_clusterSize(size()); 
         std::vector<Url> vectUrl = getUrls();