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/broker/Queue.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'cpp/src/qpid/broker/Queue.cpp') diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp index f260482db9..11b2682575 100644 --- a/cpp/src/qpid/broker/Queue.cpp +++ b/cpp/src/qpid/broker/Queue.cpp @@ -217,7 +217,11 @@ void Queue::requeue(const QueuedMessage& msg){ Mutex::ScopedLock locker(messageLock); if (!isEnqueued(msg)) return; msg.payload->enqueueComplete(); // mark the message as enqueued - messages.push_front(msg); + //put message back in correct position: + Messages::reverse_iterator i = messages.rbegin(); + while (i != messages.rend() && msg.position < i->position) { ++i; } + messages.insert(i.base(), msg); + listeners.populate(copy); // for persistLastNode - don't force a message twice to disk, but force it if no force before -- cgit v1.2.1