diff options
| author | Bhupendra Bhusman Bhardwaj <bhupendrab@apache.org> | 2007-03-26 09:30:02 +0000 |
|---|---|---|
| committer | Bhupendra Bhusman Bhardwaj <bhupendrab@apache.org> | 2007-03-26 09:30:02 +0000 |
| commit | f886a33bb5f8f11967704f1f23e2b5ba4987eab8 (patch) | |
| tree | 9fe33d8da87def8daa39389786efe627a9b5d560 /java | |
| parent | 88fe20a6ea060d101063601ce28556ff494a4955 (diff) | |
| download | qpid-python-f886a33bb5f8f11967704f1f23e2b5ba4987eab8.tar.gz | |
QPID-408
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@522463 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java | 12 |
1 files changed, 9 insertions, 3 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 879080e10c..cfa13c87fd 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 @@ -401,7 +401,10 @@ public class ConcurrentSelectorDeliveryManager implements DeliveryManager _lock.lock(); AMQMessage message = _messages.poll(); - _totalMessageSize.addAndGet(-message.getSize()); + if (message != null) + { + _totalMessageSize.addAndGet(-message.getSize()); + } _lock.unlock(); } @@ -539,7 +542,7 @@ public class ConcurrentSelectorDeliveryManager implements DeliveryManager { subscriberHasPendingResend(false, sub, null); //better to use the above method as this keeps all the tracking in one location. -// _hasContent.remove(sub); + // _hasContent.remove(sub); } _extraMessages.decrementAndGet(); @@ -552,7 +555,10 @@ public class ConcurrentSelectorDeliveryManager implements DeliveryManager } } - _totalMessageSize.addAndGet(-message.getSize()); + if ((message != null) && (messageQueue == _messages)) + { + _totalMessageSize.addAndGet(-message.getSize()); + } } catch (AMQException e) { |