From 256ff145c6818c852d444128db50ab3cde13dd39 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Fri, 28 Sep 2007 09:26:15 +0000 Subject: QPID-611 : Queue Total size calculations can cause NPE on broker. Patch supplied by Aidan Skinner git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@580265 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java') 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 d9629a20b5..ad02f477e0 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 @@ -480,7 +480,7 @@ public class ConcurrentSelectorDeliveryManager implements DeliveryManager 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()); -- cgit v1.2.1