summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2010-02-02 21:01:56 +0000
committerAlan Conway <aconway@apache.org>2010-02-02 21:01:56 +0000
commitf06e46336c1585e4b82cc7f3ddfd799c4ed7166d (patch)
treeb6f5244aebcb1750f22a4ede61419b8f09759b4c
parent702d7a791470a09cf26bb9a74a1d71818fd57dbf (diff)
downloadqpid-python-f06e46336c1585e4b82cc7f3ddfd799c4ed7166d.tar.gz
Fix cluster bug introduced in r905674, incorrect frame-sequence count.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@905794 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/cluster/Cluster.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/cluster/Cluster.cpp b/qpid/cpp/src/qpid/cluster/Cluster.cpp
index 8eda6c1949..d10e1fd458 100644
--- a/qpid/cpp/src/qpid/cluster/Cluster.cpp
+++ b/qpid/cpp/src/qpid/cluster/Cluster.cpp
@@ -474,7 +474,6 @@ void Cluster::deliveredFrame(const EventFrame& efConst) {
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 @@ void Cluster::processFrame(const EventFrame& e, Lock& l) {
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);