You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2009/04/13 15:51:54 UTC

svn commit: r764466 - in /qpid/branches/0.5-fix/qpid: ./ java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java

Author: ritchiem
Date: Mon Apr 13 13:51:53 2009
New Revision: 764466

URL: http://svn.apache.org/viewvc?rev=764466&view=rev
Log:
QPID-1583: close all app registries after use.
merged from trunk r749340

Modified:
    qpid/branches/0.5-fix/qpid/   (props changed)
    qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java

Propchange: qpid/branches/0.5-fix/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 13 13:51:53 2009
@@ -1 +1 @@
-/qpid/trunk/qpid:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315
+/qpid/trunk/qpid:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340

Modified: qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java?rev=764466&r1=764465&r2=764466&view=diff
==============================================================================
--- qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java (original)
+++ qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java Mon Apr 13 13:51:53 2009
@@ -54,6 +54,12 @@
     {
         _config = new XMLConfiguration();
     }
+    
+    @Override
+    public void tearDown()
+    {
+        ApplicationRegistry.removeAll();
+    }
 
     public void testSetJMXManagementPort() throws ConfigurationException
     {
@@ -743,7 +749,7 @@
 
     public void testCombinedConfigurationFirewallReload() throws Exception
     {
-     // Write out config
+        // Write out config
         File mainFile = File.createTempFile(getClass().getName(), null);
         File fileA = File.createTempFile(getClass().getName(), null);
         File fileB = File.createTempFile(getClass().getName(), null);
@@ -838,7 +844,6 @@
         reg.getConfiguration().reparseConfigFile();
         
         assertFalse(reg.getAccessManager().authoriseConnect(session, virtualHost));
-
     }
 
 }



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