diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-09-28 09:26:15 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-09-28 09:26:15 +0000 |
| commit | 256ff145c6818c852d444128db50ab3cde13dd39 (patch) | |
| tree | a2f6f52b98ca8edc54c060f86e34d5f472eff695 /java | |
| parent | 98b05fa63abcac4fe4ba265c9639e6b74b0b7a41 (diff) | |
| download | qpid-python-256ff145c6818c852d444128db50ab3cde13dd39.tar.gz | |
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
Diffstat (limited to 'java')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java | 2 |
1 files changed, 1 insertions, 1 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 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()); |