From 5b060554268c763cb883a102b04be21741551161 Mon Sep 17 00:00:00 2001 From: Aidan Skinner Date: Mon, 28 Jan 2008 16:48:00 +0000 Subject: Merged revisions 608477,609961,610475,610479,610806,611146 via svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r608477 | rgodfrey | 2008-01-03 13:23:04 +0000 (Thu, 03 Jan 2008) | 1 line QPID-499 : Added per-virtual host timed tasks to inspect queues (with no consumers) for expired messages ........ r609961 | ritchiem | 2008-01-08 12:59:01 +0000 (Tue, 08 Jan 2008) | 2 lines QPID-499 : Patch to update the queue size statistics when the Active TTL process runs Removed old single commented out code line from AMQSession. ........ r610475 | ritchiem | 2008-01-09 17:32:43 +0000 (Wed, 09 Jan 2008) | 1 line Qpid-723 Added exec to qpid.start ........ r610479 | ritchiem | 2008-01-09 17:39:54 +0000 (Wed, 09 Jan 2008) | 1 line Qpid-690 : Provide configurable delay between re-connecion attempts. ........ r610806 | ritchiem | 2008-01-10 14:41:37 +0000 (Thu, 10 Jan 2008) | 1 line QPID-690 : Relaxed the timings on failover as Thread.sleep is accurate to 10ms so may finish the sleep 10ms early. Resulting in erratic failures as 9.9s < 10s. ........ r611146 | ritchiem | 2008-01-11 11:33:31 +0000 (Fri, 11 Jan 2008) | 1 line Patch by Aidan Skinner to make third constructor public. This is done so that the BDBMessageStore tests can still run with the addition of the VirtualHost reaper thread. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@615943 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'java/common/src') diff --git a/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java b/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java index 461cf9591d..633cf4fe3a 100644 --- a/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java +++ b/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java @@ -215,6 +215,14 @@ public class ConcurrentLinkedMessageQueueAtomicSize extends ConcurrentLinkedQ public void remove() { last.remove(); + if(last == _mainIterator) + { + _size.decrementAndGet(); + } + else + { + _messageHeadSize.decrementAndGet(); + } } }; } -- cgit v1.2.1