Author: ritchiem
Date: Fri Sep 14 09:13:01 2007
New Revision: 575738
URL: http://svn.apache.org/viewvc?rev=575738&view=rev
Log:
QPID-572 Corrected patch for ConcurrentSelectorDeliveryManager that resolves
the ordering problem.
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=575738&r1=575737&r2=575738&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
Fri Sep 14 09:13:01 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)
{
