diff options
author | Alan Conway <aconway@apache.org> | 2010-05-31 15:14:54 +0000 |
---|---|---|
committer | Alan Conway <aconway@apache.org> | 2010-05-31 15:14:54 +0000 |
commit | 68d06cb9f5f10f3679ae1fc3c7bde86881862c38 (patch) | |
tree | bc2ef67ae97da445d1718c505332b0f47afd22a7 /cpp/src | |
parent | 7f957dec3739f454e85c4d7df90c092ff893d487 (diff) | |
download | qpid-python-68d06cb9f5f10f3679ae1fc3c7bde86881862c38.tar.gz |
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/qpid@949767 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r-- | cpp/src/qpid/cluster/Connection.cpp | 2 | ||||
-rw-r--r-- | cpp/src/qpid/cluster/RetractClient.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/qpid/cluster/Connection.cpp b/cpp/src/qpid/cluster/Connection.cpp index 0772215b83..43a47930fd 100644 --- a/cpp/src/qpid/cluster/Connection.cpp +++ b/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/cpp/src/qpid/cluster/RetractClient.cpp b/cpp/src/qpid/cluster/RetractClient.cpp index 7d9f52fc39..a8c4b0d543 100644 --- a/cpp/src/qpid/cluster/RetractClient.cpp +++ b/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()); |