From 493993c4b8851ba1a1170abb928d2f37d8060e83 Mon Sep 17 00:00:00 2001 From: "Carl C. Trieloff" Date: Sat, 11 Oct 2008 18:24:50 +0000 Subject: QPID-1306 - Added aquire safety check + test. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@703704 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/Queue.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cpp/src/qpid') diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp index 4382ac2e57..315da23965 100644 --- a/cpp/src/qpid/broker/Queue.cpp +++ b/cpp/src/qpid/broker/Queue.cpp @@ -202,7 +202,8 @@ bool Queue::acquire(const QueuedMessage& msg) { Mutex::ScopedLock locker(messageLock); QPID_LOG(debug, "attempting to acquire " << msg.position); for (Messages::iterator i = messages.begin(); i != messages.end(); i++) { - if (i->position == msg.position) { + if ((i->position == msg.position && !lastValueQueue) // note that in some cases payload not be set + || (lastValueQueue && i->position == msg.position && i->payload.get() == msg.payload.get())) { if (lastValueQueue){ const framing::FieldTable* ft = msg.payload->getApplicationHeaders(); string key = ft->getString(qpidVQMatchProperty); -- cgit v1.2.1