svn commit: r583808 - /incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java

[ritchiem]

Author: ritchiem
Date: Thu Oct 11 05:52:02 2007
New Revision: 583808

URL: http://svn.apache.org/viewvc?rev=583808&view=rev
Log:
QPID-636 : Check to ensure we only enqueue msgs that can be delivered to the 
consumer.

Modified:
    
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java

Modified: 
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java?rev=583808&r1=583807&r2=583808&view=diff
==============================================================================
--- 
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
 (original)
+++ 
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
 Thu Oct 11 05:52:02 2007
@@ -281,9 +281,12 @@
         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);
+                }
             }
         }
     }