diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2008-05-20 08:37:33 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2008-05-20 08:37:33 +0000 |
| commit | cc77970c60fc8b632b8074ccaf0411a537db1150 (patch) | |
| tree | 1f1ee3db71e18cd8f79477160fa271be72dd3886 /java/broker/src/main | |
| parent | 8e9b46bb55c8a19d414fb92417a25886f79ed88d (diff) | |
| download | qpid-python-cc77970c60fc8b632b8074ccaf0411a537db1150.tar.gz | |
Merged revisions 657859 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid
........
r657859 | ritchiem | 2008-05-19 17:54:06 +0100 (Mon, 19 May 2008) | 1 line
QPID-1066 : Removed isInfo wrapping. Added test that is missing from trunk from M2.x QueueDepthSelectorTest.
........
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.x@658166 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/src/main')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java | 8 |
1 files changed, 1 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 cf607548f8..0e8cff0f2a 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 @@ -751,13 +751,7 @@ public class ConcurrentSelectorDeliveryManager implements DeliveryManager } else if (messageQueue == sub.getPreDeliveryQueue() && !sub.isBrowser()) { - if (_log.isInfoEnabled()) - { - //fixme - we should do the clean up as the message remains on the _message queue - // this is resulting in the next consumer receiving the message and then attempting to purge it - // - cleanMainQueue(sub); - } + cleanMainQueue(sub); } } |