activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject [1/3] git commit: fix intermittent failure - exceptions that result from broker stop need to be ignored as this test forces a restart
Date Wed, 19 Mar 2014 15:34:42 GMT
Repository: activemq
Updated Branches:
  refs/heads/trunk bf8eb0e6c -> b136df177


fix intermittent failure - exceptions that result from broker stop need to be ignored as this
test forces a restart


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/89446c7a
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/89446c7a
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/89446c7a

Branch: refs/heads/trunk
Commit: 89446c7af078cd9fa45d1272b037c125fb0fa003
Parents: bf8eb0e
Author: gtully <gary.tully@gmail.com>
Authored: Wed Mar 19 15:30:34 2014 +0000
Committer: gtully <gary.tully@gmail.com>
Committed: Wed Mar 19 15:30:34 2014 +0000

----------------------------------------------------------------------
 .../activemq/usecases/DurableSubProcessMultiRestartTest.java | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/89446c7a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java
b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java
index d15bfd8..8d3117b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Vector;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -38,6 +39,7 @@ import org.apache.activemq.broker.BrokerFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.apache.activemq.transport.InactivityIOException;
 import org.apache.activemq.util.Wait;
 import org.junit.After;
 import org.junit.Before;
@@ -251,6 +253,12 @@ public class DurableSubProcessMultiRestartTest {
 
                 unsubscribe();
 
+            } catch (JMSException maybe) {
+                if (maybe.getCause() instanceof IOException) {
+                    // ok on broker shutdown;
+                } else {
+                    exit(toString() + " failed with JMSException", maybe);
+                }
             } catch (Throwable e) {
                 exit(toString() + " failed.", e);
             }


Mime
View raw message