summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2007-10-09 09:31:40 +0000
committerMartin Ritchie <ritchiem@apache.org>2007-10-09 09:31:40 +0000
commitdda4016b8aa7b6cb2fb93ef5edb647e11f2490cd (patch)
tree2a5fe4e74615b86c5ee2d11a78d416ad5b559811
parent7cab0ca900c86293f20b86d235893cfaf82944a4 (diff)
downloadqpid-python-dda4016b8aa7b6cb2fb93ef5edb647e11f2490cd.tar.gz
Update to correct error log that would occur when using selectors.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@583088 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java11
1 files changed, 9 insertions, 2 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 15a517a6b2..416a9a4d7f 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
@@ -857,9 +857,16 @@ public class ConcurrentSelectorDeliveryManager implements DeliveryManager
else
{
- if (_messages.size() > 0)
+ if (s.filtersMessages())
{
- _log.error("Direct delivery with queued msgs:" + _messages.size());
+ if (s.getPreDeliveryQueue().size() > 0)
+ {
+ _log.error("Direct delivery from PDQ with queued msgs:" + s.getPreDeliveryQueue().size());
+ }
+ }
+ else if (_messages.size() > 0)
+ {
+ _log.error("Direct delivery from MainQueue queued msgs:" + _messages.size());
}
//release lock now