activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kea...@apache.org
Subject git commit: Handle exceptions described in AMQ-5372 to avoid cascading test failures
Date Mon, 29 Sep 2014 08:47:26 GMT
Repository: activemq
Updated Branches:
  refs/heads/trunk 023b0f198 -> 8163b0b95


Handle exceptions described in AMQ-5372 to avoid cascading test failures


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

Branch: refs/heads/trunk
Commit: 8163b0b95ea66a01ec7def01b709ffc05eacaeed
Parents: 023b0f1
Author: Kevin Earls <kevin@kevinearls.com>
Authored: Mon Sep 29 10:47:09 2014 +0200
Committer: Kevin Earls <kevin@kevinearls.com>
Committed: Mon Sep 29 10:47:09 2014 +0200

----------------------------------------------------------------------
 .../java/org/apache/activemq/EmbeddedBrokerTestSupport.java     | 5 ++++-
 .../java/org/apache/activemq/transport/udp/UdpTestSupport.java  | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/8163b0b9/activemq-unit-tests/src/test/java/org/apache/activemq/EmbeddedBrokerTestSupport.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/EmbeddedBrokerTestSupport.java
b/activemq-unit-tests/src/test/java/org/apache/activemq/EmbeddedBrokerTestSupport.java
index c4d2d95..b049e96 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/EmbeddedBrokerTestSupport.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/EmbeddedBrokerTestSupport.java
@@ -58,7 +58,10 @@ public abstract class EmbeddedBrokerTestSupport extends CombinationTestSupport
{
 
     protected void tearDown() throws Exception {
         if (broker != null) {
-            broker.stop();
+            try {
+                broker.stop();
+            } catch (Exception e) {
+            }
         }
     }
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/8163b0b9/activemq-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java
b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java
index d947140..1d770de 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java
@@ -182,7 +182,10 @@ public abstract class UdpTestSupport extends TestCase implements TransportListen
 
     protected void tearDown() throws Exception {
         if (producer != null) {
-            producer.stop();
+            try {
+                producer.stop();
+            } catch (Exception e) {
+            }
         }
         if (consumer != null) {
             consumer.stop();


Mime
View raw message