You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@qpid.apache.org by rg...@apache.org on 2007/09/19 10:13:33 UTC

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

Author: rgreig
Date: Wed Sep 19 01:13:32 2007
New Revision: 577193

URL: http://svn.apache.org/viewvc?rev=577193&view=rev
Log:
QPID-572: merge of second fix from M2.1 branch

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

Modified: incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java?rev=577193&r1=577192&r2=577193&view=diff
==============================================================================
--- incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java (original)
+++ incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java Wed Sep 19 01:13:32 2007
@@ -747,7 +747,7 @@
         {
             Subscription s = _subscriptions.nextSubscriber(msg);
 
-            if (s == null || hasQueuedMessages()) //no-one can take the message right now or we're queueing
+            if (s == null || (!s.filtersMessages() && hasQueuedMessages())) //no-one can take the message right now or we're queueing
             {
                 if (debugEnabled)
                 {