Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Further patch for https://issues.apache.org/activemq/browse/AMQ-1795 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@669265 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Davies 2008-06-18 19:34:27 +00:00
parent b52624e66b
commit 8d4001ad0b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java
View File

@ -425,6 +425,7 @@ public class AMQPersistenceAdapter implements PersistenceAdapter, UsageListener,
}
Integer lastDataFile = asyncDataManager.getCurrentDataFileId();
inProgress.add(lastDataFile);
lastDataFile = asyncDataManager.getMark().getDataFileId();
inProgress.addAll(referenceStoreAdapter.getReferenceFileIdsInUse());
Location lastActiveTx = transactionStore.checkpoint();
if (lastActiveTx != null) {

4
activemq-core/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java
View File

@ -94,12 +94,12 @@ public class MissingDataFileTest extends TestCase {
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..");