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

1 files changed, 5 insertions, 2 deletions

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);
+                }
             }
         }
     }