summaryrefslogtreecommitdiff
path: root/java/broker/src
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2008-05-19 16:54:06 +0000
committerMartin Ritchie <ritchiem@apache.org>2008-05-19 16:54:06 +0000
commit5dae50b76eb27c9d9b8e28bc13bded8ae5b61cb3 (patch)
tree1e66014218a02b717fd9b6c7d114e655955d2790 /java/broker/src
parentca24cbaa5d93611615bc914fc376aba388c3f911 (diff)
downloadqpid-python-5dae50b76eb27c9d9b8e28bc13bded8ae5b61cb3.tar.gz
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/trunk/qpid@657859 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/src')
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java8
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);
}
}