You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@qpid.apache.org by ri...@apache.org on 2007/09/28 11:26:16 UTC

svn commit: r580265 - /incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java

Author: ritchiem
Date: Fri Sep 28 02:26:15 2007
New Revision: 580265

URL: http://svn.apache.org/viewvc?rev=580265&view=rev
Log:
QPID-611 : Queue Total size calculations can cause NPE on broker. Patch supplied by Aidan Skinner

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=580265&r1=580264&r2=580265&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 Fri Sep 28 02:26:15 2007
@@ -480,7 +480,7 @@
             assert removed == message;
 
             // if the message expired then the _totalMessageSize needs adjusting
-            if (message.expired(_queue))
+            if (message.expired(_queue) && !message.getDeliveredToConsumer())
             {
                 _totalMessageSize.addAndGet(-message.getSize());