1 files changed, 15 insertions, 3 deletions
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)