diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-09-14 16:13:01 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-09-14 16:13:01 +0000 |
| commit | 942379b3196bd37817c52e0fd08cb3c0efff234e (patch) | |
| tree | 5ec4b5369062771455ce55f4412885598c42788a /java | |
| parent | e8b21f32ad0d6a800ade8364936d83ac5ff1fce2 (diff) | |
| download | qpid-python-942379b3196bd37817c52e0fd08cb3c0efff234e.tar.gz | |
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
Diffstat (limited to 'java')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java | 2 |
1 files changed, 1 insertions, 1 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 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) { |