Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 47993 invoked from network); 18 Jun 2008 19:34:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Jun 2008 19:34:48 -0000 Received: (qmail 13774 invoked by uid 500); 18 Jun 2008 19:34:50 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 13741 invoked by uid 500); 18 Jun 2008 19:34:50 -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 13732 invoked by uid 99); 18 Jun 2008 19:34:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jun 2008 12:34:50 -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; Wed, 18 Jun 2008 19:34:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AFFE523889BA; Wed, 18 Jun 2008 12:34:27 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r669265 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java test/java/org/apache/activemq/bugs/MissingDataFileTest.java Date: Wed, 18 Jun 2008 19:34:27 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080618193427.AFFE523889BA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajdavies Date: Wed Jun 18 12:34:27 2008 New Revision: 669265 URL: http://svn.apache.org/viewvc?rev=669265&view=rev Log: Further patch for https://issues.apache.org/activemq/browse/AMQ-1795 Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java?rev=669265&r1=669264&r2=669265&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java Wed Jun 18 12:34:27 2008 @@ -425,6 +425,7 @@ } Integer lastDataFile = asyncDataManager.getCurrentDataFileId(); inProgress.add(lastDataFile); + lastDataFile = asyncDataManager.getMark().getDataFileId(); inProgress.addAll(referenceStoreAdapter.getReferenceFileIdsInUse()); Location lastActiveTx = transactionStore.checkpoint(); if (lastActiveTx != null) { Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java?rev=669265&r1=669264&r2=669265&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java Wed Jun 18 12:34:27 2008 @@ -94,12 +94,12 @@ SystemUsage systemUsage; systemUsage = new SystemUsage(); - systemUsage.getMemoryUsage().setLimit(1024 * 10); // Just a few messags + systemUsage.getMemoryUsage().setLimit(1024 * 1024); // Just a few messags broker.setSystemUsage(systemUsage); AMQPersistenceAdapterFactory factory = (AMQPersistenceAdapterFactory) broker.getPersistenceFactory(); factory.setMaxFileLength(2*1024); // ~4 messages - factory.setCleanupInterval(5000); // every few second + factory.setCleanupInterval(1000); // every few second broker.start(); LOG.info("Starting broker..");