qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ritch...@apache.org
Subject svn commit: r942099 - /qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
Date Fri, 07 May 2010 15:09:14 GMT
Author: ritchiem
Date: Fri May  7 15:09:14 2010
New Revision: 942099

URL: http://svn.apache.org/viewvc?rev=942099&view=rev
Log:
QPID-2579 : Improve IBBC tearDown to ensure AR remove and tearDown always occur.

Modified:
    qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java?rev=942099&r1=942098&r2=942099&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
(original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
Fri May  7 15:09:14 2010
@@ -86,9 +86,21 @@ public class InternalBrokerBaseCase exte
 
     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)



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message