From commits-return-13598-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Tue May 18 11:52:48 2010 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 17911 invoked from network); 18 May 2010 11:52:48 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 18 May 2010 11:52:48 -0000 Received: (qmail 20361 invoked by uid 500); 18 May 2010 11:52:48 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 20299 invoked by uid 500); 18 May 2010 11:52:47 -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 20292 invoked by uid 99); 18 May 2010 11:52:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 May 2010 11:52:47 +0000 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; Tue, 18 May 2010 11:52:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 75D41238897D; Tue, 18 May 2010 11:52:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r945600 - /activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DataFileNotDeletedTest.java Date: Tue, 18 May 2010 11:52:23 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100518115223.75D41238897D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajdavies Date: Tue May 18 11:52:23 2010 New Revision: 945600 URL: http://svn.apache.org/viewvc?rev=945600&view=rev Log: Explicitly set the PersistenceAdapterFactory Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DataFileNotDeletedTest.java Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DataFileNotDeletedTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DataFileNotDeletedTest.java?rev=945600&r1=945599&r2=945600&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DataFileNotDeletedTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DataFileNotDeletedTest.java Tue May 18 11:52:23 2010 @@ -17,7 +17,6 @@ package org.apache.activemq.bugs; import java.util.concurrent.CountDownLatch; - import javax.jms.Connection; import javax.jms.JMSException; import javax.jms.Message; @@ -25,9 +24,7 @@ import javax.jms.MessageConsumer; import javax.jms.MessageListener; import javax.jms.ObjectMessage; import javax.jms.Session; - import junit.framework.TestCase; - import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.kaha.impl.async.AsyncDataManager; @@ -46,7 +43,7 @@ public class DataFileNotDeletedTest exte private final CountDownLatch latch = new CountDownLatch(max_messages); private static int max_messages = 600; private static int messageCounter; - private String destinationName = getName()+"_Queue"; + private final String destinationName = getName()+"_Queue"; private BrokerService broker; private Connection receiverConnection; private Connection producerConnection; @@ -55,6 +52,7 @@ public class DataFileNotDeletedTest exte AMQPersistenceAdapter persistentAdapter; protected static final String payload = new String(new byte[512]); + @Override public void setUp() throws Exception { messageCounter = 0; startBroker(); @@ -64,6 +62,7 @@ public class DataFileNotDeletedTest exte producerConnection.start(); } + @Override public void tearDown() throws Exception { receiverConnection.close(); producerConnection.close(); @@ -122,7 +121,7 @@ public class DataFileNotDeletedTest exte broker.setPersistent(true); broker.setUseJmx(true); broker.addConnector("tcp://localhost:61616").setName("Default"); - + broker.setPersistenceFactory(new AMQPersistenceAdapterFactory()); AMQPersistenceAdapterFactory factory = (AMQPersistenceAdapterFactory) broker.getPersistenceFactory(); // ensure there are a bunch of data files but multiple entries in each factory.setMaxFileLength(1024 * 20);