From 52fcabc92143d00f5a950362f3939e75e2b847c3 Mon Sep 17 00:00:00 2001 From: "Carl C. Trieloff" Date: Fri, 31 Jul 2009 13:14:25 +0000 Subject: Some clean up, and better error check git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@799598 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/replication/ReplicationExchange.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'cpp') diff --git a/cpp/src/qpid/replication/ReplicationExchange.cpp b/cpp/src/qpid/replication/ReplicationExchange.cpp index 053335e6ad..b5911bb71e 100644 --- a/cpp/src/qpid/replication/ReplicationExchange.cpp +++ b/cpp/src/qpid/replication/ReplicationExchange.cpp @@ -85,19 +85,21 @@ void ReplicationExchange::handleEnqueueEvent(const FieldTable* args, Deliverable if (queue) { SequenceNumber seqno1(args->getAsInt(QUEUE_MESSAGE_POSITION)); - - if (queue->getPosition() > seqno1) // test queue.pos < seqnumber + + // note that queue will ++ before enqueue. + if (queue->getPosition() > --seqno1) // test queue.pos < seqnumber { QPID_LOG(error, "Cannot enqueue replicated message. Destination Queue " << queueName << " ahead of source queue"); mgmtExchange->inc_msgDrops(); mgmtExchange->inc_byteDrops(msg.contentSize()); } else { - queue->setPosition(--seqno1); // note that queue will ++ before enqueue. + queue->setPosition(seqno1); FieldTable& headers = msg.getMessage().getProperties()->getApplicationHeaders(); headers.erase(REPLICATION_TARGET_QUEUE); headers.erase(REPLICATION_EVENT_SEQNO); headers.erase(REPLICATION_EVENT_TYPE); + headers.erase(QUEUE_MESSAGE_POSITION); msg.deliverTo(queue); QPID_LOG(debug, "Enqueued replicated message onto " << queueName); if (mgmtExchange != 0) { -- cgit v1.2.1