You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2010/05/31 17:14:59 UTC
svn commit: r949767 - in /qpid/trunk/qpid/cpp/src/qpid/cluster:
Connection.cpp RetractClient.cpp
Author: aconway
Date: Mon May 31 15:14:54 2010
New Revision: 949767
URL: http://svn.apache.org/viewvc?rev=949767&view=rev
Log:
Fixed assertion error in cluster_tests.py test_failover.
Added missing call to expandd in cluster/RetractClient.cpp
Modified:
qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/RetractClient.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp?rev=949767&r1=949766&r2=949767&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp Mon May 31 15:14:54 2010
@@ -439,7 +439,7 @@ void Connection::membership(const FieldT
}
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.
}
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/RetractClient.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/RetractClient.cpp?rev=949767&r1=949766&r2=949767&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/RetractClient.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/RetractClient.cpp Mon May 31 15:14:54 2010
@@ -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());
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org