summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/cluster/Cluster.cpp
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
commitb5d89088886b2d745c8bbdab747463bcd8679893 (patch)
tree4aec163bbd6c83816e7dbbdf055a2193d45a3c89 /cpp/src/qpid/cluster/Cluster.cpp
parente9969dfec63c13533d2609c0cd0fa24a75c4c03f (diff)
downloadqpid-python-b5d89088886b2d745c8bbdab747463bcd8679893.tar.gz
Fix cluster bug introduced in r905674, incorrect frame-sequence count.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@905794 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster/Cluster.cpp')
-rw-r--r--cpp/src/qpid/cluster/Cluster.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp
index 8eda6c1949..d10e1fd458 100644
--- a/cpp/src/qpid/cluster/Cluster.cpp
+++ b/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);