From 141b05b3e7fbe0f49c586a7b4265ad2cb088b27b Mon Sep 17 00:00:00 2001 From: "Carl C. Trieloff" Date: Mon, 19 Jan 2009 19:25:29 +0000 Subject: Put messages into LVQ FIFO if no key is specified. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@735776 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/Queue.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (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 5acc474aa1..6e0d777276 100644 --- a/cpp/src/qpid/broker/Queue.cpp +++ b/cpp/src/qpid/broker/Queue.cpp @@ -206,8 +206,8 @@ void Queue::requeue(const QueuedMessage& msg){ } void Queue::clearLVQIndex(const QueuedMessage& msg){ - if (lastValueQueue){ - const framing::FieldTable* ft = msg.payload->getApplicationHeaders(); + const framing::FieldTable* ft = msg.payload->getApplicationHeaders(); + if (lastValueQueue && ft){ string key = ft->getAsString(qpidVQMatchProperty); lvq.erase(key); } @@ -512,8 +512,8 @@ uint32_t Queue::move(const Queue::shared_ptr destq, uint32_t qty) { void Queue::popMsg(QueuedMessage& qmsg) { - if (lastValueQueue){ - const framing::FieldTable* ft = qmsg.payload->getApplicationHeaders(); + const framing::FieldTable* ft = qmsg.payload->getApplicationHeaders(); + if (lastValueQueue && ft){ string key = ft->getAsString(qpidVQMatchProperty); lvq.erase(key); } @@ -529,15 +529,15 @@ void Queue::push(boost::intrusive_ptr& msg){ if (policy.get()) policy->tryEnqueue(qm); LVQ::iterator i; - if (lastValueQueue){ - const framing::FieldTable* ft = msg->getApplicationHeaders(); + const framing::FieldTable* ft = msg->getApplicationHeaders(); + if (lastValueQueue && ft){ string key = ft->getAsString(qpidVQMatchProperty); i = lvq.find(key); if (i == lvq.end()){ messages.push_back(qm); listeners.populate(copy); - lvq[key] = msg; + lvq[key] = msg; }else { i->second->setReplacementMessage(msg,this); dequeued(QueuedMessage(qm.queue, i->second, qm.position)); -- cgit v1.2.1