Updated Branches: refs/heads/trunk cfeea7797 -> 61e13fa6c
Fixing regression caused by changes to SuppressRelyException in commit b0e91d47f5fced59c89a34d993f4d87c7986b04b. Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/61e13fa6 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/61e13fa6 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/61e13fa6 Branch: refs/heads/trunk Commit: 61e13fa6ce03029df2eb78762d6bf11b07a36dd3 Parents: cfeea77 Author: Hiram Chirino <[email protected]> Authored: Mon Dec 2 12:29:21 2013 -0500 Committer: Hiram Chirino <[email protected]> Committed: Mon Dec 2 12:29:21 2013 -0500 ---------------------------------------------------------------------- .../main/scala/org/apache/activemq/leveldb/LevelDBStore.scala | 4 ++-- .../apache/activemq/store/LevelDBStorePerDestinationTest.java | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/61e13fa6/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala index e4c7a02..43238a9 100644 --- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala +++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala @@ -437,13 +437,13 @@ class LevelDBStore extends LockableServiceSupport with BrokerServiceAware with P def verify_running = { if( isStopping || isStopped ) { try { - throw new SuppressReplyException("Not running") + throw new IOException("Not running") } catch { case e:IOException => if( broker_service!=null ) { broker_service.handleIOException(e) } - throw e + throw new SuppressReplyException(e); } } } http://git-wip-us.apache.org/repos/asf/activemq/blob/61e13fa6/activemq-unit-tests/src/test/java/org/apache/activemq/store/LevelDBStorePerDestinationTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/LevelDBStorePerDestinationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/LevelDBStorePerDestinationTest.java index fe15be5..b10786c 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/LevelDBStorePerDestinationTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/LevelDBStorePerDestinationTest.java @@ -18,7 +18,6 @@ package org.apache.activemq.store; import org.apache.activemq.leveldb.LevelDBStore; import org.junit.Test; -import org.junit.Ignore; import java.io.IOException; @@ -35,12 +34,10 @@ public class LevelDBStorePerDestinationTest extends StorePerDestinationTest { return store; } - @Ignore("needs some investigation w.r.t to SuppressReplyException - broken by: https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=commit;h=b0e91d47";) @Test @Override public void testRollbackRecovery() throws Exception {} - @Ignore("needs some investigation w.r.t to SuppressReplyException - broken by: https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=commit;h=b0e91d47";) @Test @Override public void testCommitRecovery() throws Exception {}
