From 3456342c85bfbe89cca54243886ab914d683f825 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Thu, 11 Oct 2007 12:52:02 +0000 Subject: QPID-636 : Check to ensure we only enqueue msgs that can be delivered to the consumer. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@583808 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/queue/ConcurrentSelectorDeliveryManager.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'java') diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java b/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java index 416a9a4d7f..a1d31d2cbd 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java +++ b/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java @@ -281,9 +281,12 @@ public class ConcurrentSelectorDeliveryManager implements DeliveryManager while (currentQueue.hasNext()) { AMQMessage message = currentQueue.next(); - if (subscription.hasInterest(message)) + if (!message.getDeliveredToConsumer()) { - subscription.enqueueForPreDelivery(message, false); + if (subscription.hasInterest(message)) + { + subscription.enqueueForPreDelivery(message, false); + } } } } -- cgit v1.2.1