From 942379b3196bd37817c52e0fd08cb3c0efff234e Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Fri, 14 Sep 2007 16:13:01 +0000 Subject: QPID-572 Corrected patch for ConcurrentSelectorDeliveryManager that resolves the ordering problem. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@575738 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 43fcc57556..026761a618 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 @@ -747,7 +747,7 @@ public class ConcurrentSelectorDeliveryManager implements DeliveryManager { 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) { -- cgit v1.2.1