From 4c83ded125ecf99c71f2cf2de2b68711db582a53 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Wed, 30 Sep 2009 15:58:16 +0000 Subject: QPID-2118 : Corrected 010Exclude for runtime selector exception. Tidied up SelectorTest so that it uses more of QTC functionality and stops creating random queue names. The init() methods could be totally removed with a bit more work. Updated test() to be testOnMessage() to better identify what test was supposed to be using onMessage() previously they all were! JMSMessageID test should now pass again on CPP profile. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@820321 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'java/broker/src') diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java index 9894efed20..4b9fc9ca55 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java +++ b/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java @@ -1338,7 +1338,7 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener * Looks up the next node for the subscription and attempts to deliver it. * * @param sub - * @return + * @return true if we have completed all possible deliveries for this sub. * @throws AMQException */ private boolean attemptDelivery(Subscription sub) throws AMQException @@ -1349,7 +1349,10 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener if (subActive) { QueueEntry node = moveSubscriptionToNextNode(sub); - _logger.debug(sub + ": attempt delivery: " + node.debugIdentity()); + if (_logger.isDebugEnabled()) + { + _logger.debug(sub + ": attempting Delivery: " + node.debugIdentity()); + } if (!(node.isAcquired() || node.isDeleted())) { if (sub.hasInterest(node)) -- cgit v1.2.1