activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajdav...@apache.org
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 GMT
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..");



Mime
View raw message