From 2373179461b356f540dacd27d0fd7413b0a550e2 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Thu, 12 Feb 2009 20:01:32 +0000 Subject: Queue::checkLvqReplace() needs to update the lvq map if it makes a replacement or the map will contain a pointer to a stale message and further updates will be lost. Also added in locking to set-/get- ReplacementMessage() in Message.cpp git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@743857 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/Queue.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 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 c9ee7f394f..bcce83af1e 100644 --- a/cpp/src/qpid/broker/Queue.cpp +++ b/cpp/src/qpid/broker/Queue.cpp @@ -587,10 +587,19 @@ QueuedMessage Queue::getFront() return msg; } -QueuedMessage& Queue::checkLvqReplace(QueuedMessage& msg) const +QueuedMessage& Queue::checkLvqReplace(QueuedMessage& msg) { boost::intrusive_ptr replacement = msg.payload->getReplacementMessage(this); - if (replacement.get()) msg.payload = replacement; + if (replacement.get()) { + const framing::FieldTable* ft = replacement->getApplicationHeaders(); + if (ft) { + string key = ft->getAsString(qpidVQMatchProperty); + if (lvq.find(key) != lvq.end()){ + lvq[key] = replacement; + } + } + msg.payload = replacement; + } return msg; } -- cgit v1.2.1