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/02/02 22:02:00 UTC
svn commit: r905794 - /qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp
Author: aconway
Date: Tue Feb 2 21:01:56 2010
New Revision: 905794
URL: http://svn.apache.org/viewvc?rev=905794&view=rev
Log:
Fix cluster bug introduced in r905674, incorrect frame-sequence count.
Modified:
qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp?rev=905794&r1=905793&r2=905794&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp Tue Feb 2 21:01:56 2010
@@ -474,7 +474,6 @@
void Cluster::processFrame(const EventFrame& e, Lock& l) {
- map.incrementFrameSeq();
if (e.isCluster()) {
QPID_LOG(trace, *this << " DLVR: " << e);
ClusterDispatcher dispatch(*this, e.connectionId.getMember(), l);
@@ -482,6 +481,7 @@
throw Exception(QPID_MSG("Invalid cluster control"));
}
else if (state >= CATCHUP) {
+ map.incrementFrameSeq();
ConnectionPtr connection = getConnection(e, l);
if (connection) {
QPID_LOG(trace, *this << " DLVR " << map.getFrameSeq() << ": " << e);
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org