diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-10-19 15:03:01 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-10-19 15:03:01 +0000 |
| commit | 6e0d585943d5ca5cdbc3891abc04c1f2d0dabe4b (patch) | |
| tree | 6aba2a832a7df3c43331c38e53bee903f3d90a02 | |
| parent | 931b2c6497180d8d930e08cb06a6b9fb3e84aec8 (diff) | |
| download | qpid-python-6e0d585943d5ca5cdbc3891abc04c1f2d0dabe4b.tar.gz | |
Merged revisions 573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-581967,581969-582197,582199-582200,582203-582204,582206-582262,582264,582267-583084,583087,583089-583104,583106-583146,583148-583153,583155-583169,583171-583172,583174-583398,583400-583414,583416-583417,583419-583437,583439-583482,583484-583517,583519-583545,583547,583549-583774,583777-583807,583809-583881,583883-584107,584109-584112,584114-584123,584125-585564,585566-585569,585571-585574,585576-585641,585643-585905,585907-585911,585913-586343,586345-586373,586375-586489 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
........
r586489 | ritchiem | 2007-10-19 16:01:15 +0100 (Fri, 19 Oct 2007) | 3 lines
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.
........
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@586492 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java | 14 |
1 files changed, 7 insertions, 7 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 71e50b178c..eabc8ebf38 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 @@ -830,13 +830,6 @@ public class ConcurrentSelectorDeliveryManager implements DeliveryManager //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 @@ public class ConcurrentSelectorDeliveryManager implements DeliveryManager 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 |