Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 43898 invoked from network); 2 Oct 2008 10:47:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Oct 2008 10:47:07 -0000 Received: (qmail 86449 invoked by uid 500); 2 Oct 2008 10:47:06 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 86433 invoked by uid 500); 2 Oct 2008 10:47:05 -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 86424 invoked by uid 99); 2 Oct 2008 10:47:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Oct 2008 03:47:05 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 02 Oct 2008 10:46:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DF481238896D; Thu, 2 Oct 2008 03:46:15 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r701072 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java Date: Thu, 02 Oct 2008 10:46:15 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081002104615.DF481238896D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gtully Date: Thu Oct 2 03:46:15 2008 New Revision: 701072 URL: http://svn.apache.org/viewvc?rev=701072&view=rev Log: fix AMQ-1962, reset or cursor as a result of empty subscription list was incorrectly setting store size to 0 Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java?rev=701072&r1=701071&r2=701072&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java Thu Oct 2 03:46:15 2008 @@ -194,7 +194,7 @@ batchList.clear(); batchResetNeeded = true; this.cacheEnabled=false; - size=0; + size = getStoreSize(); } protected final synchronized void fillBatch() {