From 866d10b0fdd44c6df8ea8fd2f497b1bc28fc432d Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 31 May 2010 15:14:54 +0000 Subject: Fixed assertion error in cluster_tests.py test_failover. Added missing call to expandd in cluster/RetractClient.cpp git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@949767 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/cluster/Connection.cpp | 2 +- qpid/cpp/src/qpid/cluster/RetractClient.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'qpid/cpp') diff --git a/qpid/cpp/src/qpid/cluster/Connection.cpp b/qpid/cpp/src/qpid/cluster/Connection.cpp index 0772215b83..43a47930fd 100644 --- a/qpid/cpp/src/qpid/cluster/Connection.cpp +++ b/qpid/cpp/src/qpid/cluster/Connection.cpp @@ -439,7 +439,7 @@ void Connection::membership(const FieldTable& joiners, const FieldTable& members } void Connection::retractOffer() { - QPID_LOG(debug, cluster << " incoming update retracted on connection " << *this); + QPID_LOG(info, cluster << " incoming update retracted on connection " << *this); cluster.updateInRetracted(); self.second = 0; // Mark this as completed update connection. } diff --git a/qpid/cpp/src/qpid/cluster/RetractClient.cpp b/qpid/cpp/src/qpid/cluster/RetractClient.cpp index 7d9f52fc39..a8c4b0d543 100644 --- a/qpid/cpp/src/qpid/cluster/RetractClient.cpp +++ b/qpid/cpp/src/qpid/cluster/RetractClient.cpp @@ -52,6 +52,7 @@ void RetractClient::run() { c.open(url, connectionSettings); AutoClose ac(c); AMQFrame retract((ClusterConnectionRetractOfferBody())); + client::ConnectionAccess::getImpl(c)->expand(retract.encodedSize(), false); client::ConnectionAccess::getImpl(c)->handle(retract); } catch (const std::exception& e) { QPID_LOG(error, " while retracting retract to " << url << ": " << e.what()); -- cgit v1.2.1