From 5207f02e6a2f96113183dc2da58a819d8ff0ac3e Mon Sep 17 00:00:00 2001
From: "Timothy A. Bish" <tabish@apache.org>
Date: Wed, 31 Oct 2012 21:13:45 +0000
Subject: [PATCH] fix brokerSerivce instances left running if assertions fail

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1404354 13f79535-47bb-0310-9956-ffa450edef68
---
 .../activemq/network/DuplexNetworkMBeanTest.java  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java b/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java
index fc6f6a9508..c93ee05082 100644
--- a/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java
@@ -62,12 +62,15 @@ public class DuplexNetworkMBeanTest {
             BrokerService networkedBroker = null;
             for (int i=0; i<numRestarts; i++) {
                 networkedBroker = createNetworkedBroker();
-                networkedBroker.start();
-                assertEquals(1, countMbeans(networkedBroker, "NetworkBridge", 2000));
-                assertEquals(1, countMbeans(broker, "NetworkBridge", 2000));
-                assertEquals(1, countMbeans(broker, "Connection"));
-                networkedBroker.stop();
-                networkedBroker.waitUntilStopped();
+                try {
+                    networkedBroker.start();
+                    assertEquals(1, countMbeans(networkedBroker, "NetworkBridge", 2000));
+                    assertEquals(1, countMbeans(broker, "NetworkBridge", 2000));
+                    assertEquals(1, countMbeans(broker, "Connection"));
+                } finally {
+                    networkedBroker.stop();
+                    networkedBroker.waitUntilStopped();
+                }
                 assertEquals(0, countMbeans(networkedBroker, "stopped"));
                 assertEquals(0, countMbeans(broker, "NetworkBridge"));
             }