From a6801aa6ac2c6d97b6747ef7bd7d2264be9c58ab Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 16 Jun 2010 20:32:04 +0000 Subject: Bug 603835 - cluster_tests.test_management failing. Clean up connections causing extra connection objects in the mangement agent map. - update connection was not being closed. - connections belonging to members that left the cluster were not fully cleaned up Also fixed test errors making failover_soak fail sporadically. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@955370 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/cluster/Cluster.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'cpp/src/qpid/cluster/Cluster.cpp') diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp index 9ca6fbf2bf..5d13c1ad8f 100644 --- a/cpp/src/qpid/cluster/Cluster.cpp +++ b/cpp/src/qpid/cluster/Cluster.cpp @@ -361,7 +361,6 @@ void Cluster::erase(const ConnectionId& id) { // Called by Connection::deliverClose() in deliverFrameQueue thread. void Cluster::erase(const ConnectionId& id, Lock&) { - QPID_LOG(info, *this << " connection closed " << id); connections.erase(id); decoder.erase(id); } @@ -1024,7 +1023,7 @@ void Cluster::memberUpdate(Lock& l) { ConnectionMap::iterator j = i++; MemberId m = j->second->getId().getMember(); if (m != self && !map.isMember(m)) { - j->second->getBrokerConnection().closed(); + j->second->close(); erase(j->second->getId(), l); } } -- cgit v1.2.1