Author: tabish
Date: Tue Apr 30 21:12:28 2013
New Revision: 1477830
URL: http://svn.apache.org/r1477830
Log:
apply patch: https://issues.apache.org/jira/browse/AMQ-4500
Modified:
activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java
Modified:
activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java?rev=1477830&r1=1477829&r2=1477830&view=diff
==============================================================================
---
activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java
(original)
+++
activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java
Tue Apr 30 21:12:28 2013
@@ -39,6 +39,8 @@ import org.apache.activemq.ActiveMQSessi
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.leveldb.LevelDBStore;
+import org.apache.activemq.store.PersistenceAdapter;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import org.apache.activemq.store.kahadb.disk.journal.DataFile;
import org.apache.activemq.util.Wait;
@@ -164,6 +166,10 @@ public class AMQ2832Test {
public void testAlternateLossScenario() throws Exception {
startBroker();
+ PersistenceAdapter pa = broker.getPersistenceAdapter();
+ if (pa instanceof LevelDBStore) {
+ return;
+ }
ActiveMQQueue queue = new ActiveMQQueue("MyQueue");
ActiveMQQueue disposable = new ActiveMQQueue("MyDisposableQueue");
@@ -213,6 +219,7 @@ public class AMQ2832Test {
}
private int getNumberOfJournalFiles() throws IOException {
+
Collection<DataFile> files =
((KahaDBPersistenceAdapter)
broker.getPersistenceAdapter()).getStore().getJournal().getFileMap().values();
int reality = 0;