From 8163b0b95ea66a01ec7def01b709ffc05eacaeed Mon Sep 17 00:00:00 2001
From: Kevin Earls <kevin@kevinearls.com>
Date: Mon, 29 Sep 2014 10:47:09 +0200
Subject: [PATCH] Handle exceptions described in AMQ-5372 to avoid cascading
 test failures

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

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 c4d2d953a6..b049e960c9 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) {
+            }
         }
     }
 
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 d947140af2..1d770de24e 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();