Attachment 627709 Details for Bug 866677 – Proposed patch

[patch] Proposed patch

bz866677.patch (text/plain), 1.71 KB, created by Jason Dillaman on 2012-10-15 21:23:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Dillaman

Created: 2012-10-15 21:23:09 UTC

Size: 1.71 KB

patch

obsolete

>diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
>index e04803c..975dbd2 100644
>--- a/qpid/cpp/src/qpid/broker/Queue.cpp
>+++ b/qpid/cpp/src/qpid/broker/Queue.cpp
>@@ -415,8 +415,7 @@ Queue::ConsumeCode Queue::consumeNextMessage(QueuedMessage& m, Consumer::shared_
>             return NO_MESSAGES;
>         }
>
>-        if (msg.payload->hasExpired()) {
>-            QPID_LOG(debug, "Message expired from queue '" << name << "'");
>+        if (isExpired(msg)) {
>             c->setPosition(msg.position);
>             dequeue(0, msg);
>             if (mgmtObject) {
>@@ -611,10 +610,17 @@ bool collectIf(QueuedMessage& qm, Messages::Predicate predicate,
>         return false;
>     }
> }
>-
>-bool isExpired(const QueuedMessage& qm) { return qm.payload->hasExpired(); }
> } // namespace
>
>+bool Queue::isExpired(const QueuedMessage& qm) { 
>+    if (qm.payload->hasExpired()) {
>+        QPID_LOG(debug, "Message expired from queue '" << qm.queue->getName() << "' properties:" <<
>+                 *(qm.payload->getProperties<MessageProperties>()));
>+        return true;
>+    }
>+    return false;
>+}
>+
> void Queue::dequeueIf(Messages::Predicate predicate,
>                       std::deque<QueuedMessage>& dequeued)
> {
>diff --git a/qpid/cpp/src/qpid/broker/Queue.h b/qpid/cpp/src/qpid/broker/Queue.h
>index d4beed9..2fa6253 100644
>--- a/qpid/cpp/src/qpid/broker/Queue.h
>+++ b/qpid/cpp/src/qpid/broker/Queue.h
>@@ -177,6 +177,7 @@ class Queue : public boost::enable_shared_from_this<Queue>,
>     bool checkNotDeleted(const Consumer::shared_ptr& c);
>     void notifyDeleted();
>     void dequeueIf(Messages::Predicate predicate, std::deque<QueuedMessage>& dequeued);
>+    static bool isExpired(const QueuedMessage& msg);
>
>   public:
>

Actions: View | Diff

Attachments on bug 866677: 627709