Cluster: clean up connections when a member leaves the cluster.

Fixed a memory error in cluster_test and some reporting errors in test scripts.


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

1 files changed, 11 insertions, 0 deletions

diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp
index 70c73191ee..f6022aa5b8 100644
--- a/cpp/src/qpid/cluster/Cluster.cpp
+++ b/cpp/src/qpid/cluster/Cluster.cpp
@@ -565,6 +565,17 @@ void Cluster::memberUpdate(Lock& l) {
         }
         mgmtObject->set_members(urlstr);
     }
+
+    //close connections belonging to members that have now been excluded
+    for (ConnectionMap::iterator i = connections.begin(); i != connections.end();) {
+        MemberId member = i->first.getMember();
+        if (member != myId && !map.isMember(member)) { 
+            i->second->left();
+            connections.erase(i++);
+        } else {
+            i++;
+        }
+    }
 }
 
 std::ostream& operator<<(std::ostream& o, const Cluster& cluster) {