From 650e4e538e834fd21ee6271db431d358e22b5246 Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Fri, 7 May 2010 15:09:14 +0000
Subject: QPID-2579 : Improve IBBC tearDown to ensure AR remove and tearDown
 always occur.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@942099 13f79535-47bb-0310-9956-ffa450edef68
---
 .../qpid/server/util/InternalBrokerBaseCase.java       | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
index 85412cf74e..88178041ca 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
@@ -86,9 +86,21 @@ public class InternalBrokerBaseCase extends TestCase
 
     public void tearDown() throws Exception
     {
-        CurrentActor.remove();
-        ApplicationRegistry.remove();
-        super.tearDown();
+        try
+        {
+            CurrentActor.remove();
+        }
+        finally
+        {
+            try
+            {
+                ApplicationRegistry.remove();
+            }
+            finally
+            {
+                super.tearDown();
+            }
+        }
     }
 
     protected void checkStoreContents(int messageCount)
-- 
cgit v1.2.1