Author: ritchiem
Date: Fri Oct 19 08:01:15 2007
New Revision: 586489
URL: http://svn.apache.org/viewvc?rev=586489&view=rev
Log:
QPID-647 : Update to ConcurrentSelectorDeliveryManager to restart async process
if a msg is queued that has the potential to be delivered.
Delayed the restart until the Filtering subscribers have the message enqueued
to their PDQs.
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=586489&r1=586488&r2=586489&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 Oct 19 08:01:15 2007
@@ -830,13 +830,6 @@
//release lock now message is on queue.
_lock.unlock();
- //if we have a non-filtering subscriber but queued
messages && we're not Async && we have other Active subs then something is
wrong!
- if ((s != null && hasQueuedMessages()) &&
!isProcessingAsync() && _subscriptions.hasActiveSubscribers())
- {
- _queue.deliverAsync();
- }
-
-
//Pre Deliver to all subscriptions
if (debugEnabled)
{
@@ -868,6 +861,13 @@
sub.enqueueForPreDelivery(msg, deliverFirst);
}
}
+
+ //if we have a non-filtering subscriber but queued
messages && we're not Async && we have other Active subs then something is
wrong!
+ if ((s != null && hasQueuedMessages()) &&
!isProcessingAsync() && _subscriptions.hasActiveSubscribers())
+ {
+ _queue.deliverAsync();
+ }
+
}
}
else
