Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3EC60CEFA for ; Tue, 25 Jun 2013 11:49:01 +0000 (UTC) Received: (qmail 35700 invoked by uid 500); 25 Jun 2013 11:49:00 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 35279 invoked by uid 500); 25 Jun 2013 11:48:56 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 35271 invoked by uid 99); 25 Jun 2013 11:48:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Jun 2013 11:48:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Jun 2013 11:48:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CD9BE2388847; Tue, 25 Jun 2013 11:48:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1496430 - in /activemq/trunk: activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java Date: Tue, 25 Jun 2013 11:48:35 -0000 To: commits@activemq.apache.org From: dejanb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130625114835.CD9BE2388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dejanb Date: Tue Jun 25 11:48:35 2013 New Revision: 1496430 URL: http://svn.apache.org/r1496430 Log: https://issues.apache.org/jira/browse/AMQ-4598 - negative queue size after purge Modified: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java Modified: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java?rev=1496430&r1=1496429&r2=1496430&view=diff ============================================================================== --- activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java (original) +++ activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java Tue Jun 25 11:48:35 2013 @@ -563,6 +563,7 @@ public class Queue extends BaseDestinati } } } + for (MessageReference ref : unAckedMessages) { QueueMessageReference qmr = (QueueMessageReference) ref; if (qmr.getLockOwner() == sub) { @@ -581,7 +582,9 @@ public class Queue extends BaseDestinati } } } - redeliveredWaitingDispatch.addMessageLast(qmr); + if (!qmr.isDropped()) { + redeliveredWaitingDispatch.addMessageLast(qmr); + } } if (sub instanceof QueueBrowserSubscription) { ((QueueBrowserSubscription)sub).decrementQueueRef(); @@ -1800,13 +1803,15 @@ public class Queue extends BaseDestinati } private void dropMessage(QueueMessageReference reference) { - reference.drop(); - destinationStatistics.getMessages().decrement(); - pagedInMessagesLock.writeLock().lock(); - try{ - pagedInMessages.remove(reference.getMessageId()); - }finally { - pagedInMessagesLock.writeLock().unlock(); + if (!reference.isDropped()) { + reference.drop(); + destinationStatistics.getMessages().decrement(); + pagedInMessagesLock.writeLock().lock(); + try { + pagedInMessages.remove(reference.getMessageId()); + } finally { + pagedInMessagesLock.writeLock().unlock(); + } } } Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java?rev=1496430&r1=1496429&r2=1496430&view=diff ============================================================================== --- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java (original) +++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java Tue Jun 25 11:48:35 2013 @@ -134,6 +134,14 @@ public class QueuePurgeTest extends Comb assertEquals("Queue size is not zero, it's " + proxy.getQueueSize(), 0, proxy.getQueueSize()); assertEquals("usage goes to duck", 0, proxy.getMemoryPercentUsage()); + Message msg; + do { + msg = consumer.receive(1000); + if (msg != null) { + msg.acknowledge(); + } + } while (msg != null); + assertEquals("Queue size not valid", 0, proxy.getQueueSize()); } private QueueViewMBean getProxyToQueueViewMBean()