Author: ritchiem
Date: Tue Oct  9 02:31:40 2007
New Revision: 583088

URL: http://svn.apache.org/viewvc?rev=583088&view=rev
Log:
Update to correct error log that would occur when using selectors.

Modified:
    
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java

Modified: 
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java?rev=583088&r1=583087&r2=583088&view=diff
==============================================================================
--- 
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
 (original)
+++ 
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
 Tue Oct  9 02:31:40 2007
@@ -857,9 +857,16 @@
             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


Reply via email to