From bb32d235be89547bb7e8621ce56c66e4dabdd43a Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Mon, 9 Nov 2009 11:50:39 +0000 Subject: QPID-2191: Fix browsing behaviour where messages may have been released out of order git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@834026 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/cluster/Connection.cpp | 1 + cpp/src/qpid/cluster/UpdateClient.cpp | 1 + 2 files changed, 2 insertions(+) (limited to 'cpp/src/qpid/cluster') diff --git a/cpp/src/qpid/cluster/Connection.cpp b/cpp/src/qpid/cluster/Connection.cpp index 6873827b81..841c3b610d 100644 --- a/cpp/src/qpid/cluster/Connection.cpp +++ b/cpp/src/qpid/cluster/Connection.cpp @@ -378,6 +378,7 @@ void Connection::deliveryRecord(const string& qname, if (acquired) { // Message is on the update queue m = getUpdateMessage(); m.queue = queue.get(); + m.position = position; if (enqueued) queue->enqueued(m); //inform queue of the message } else { // Message at original position in original queue m = queue->find(position); diff --git a/cpp/src/qpid/cluster/UpdateClient.cpp b/cpp/src/qpid/cluster/UpdateClient.cpp index a9761962e8..f263577fd3 100644 --- a/cpp/src/qpid/cluster/UpdateClient.cpp +++ b/cpp/src/qpid/cluster/UpdateClient.cpp @@ -252,6 +252,7 @@ void UpdateClient::updateQueue(client::AsyncSession& s, const boost::shared_ptr< MessageUpdater updater(q->getName(), s, expiry); q->eachMessage(boost::bind(&MessageUpdater::updateQueuedMessage, &updater, _1)); q->eachBinding(boost::bind(&UpdateClient::updateBinding, this, s, q->getName(), _1)); + ClusterConnectionProxy(s).queuePosition(q->getName(), q->getPosition()); } void UpdateClient::updateExclusiveQueue(const boost::shared_ptr& q) { -- cgit v1.2.1