[hornetq-commits] JBoss hornetq SVN: r9981 - trunk/tests/src/org/hornetq/tests/integration/management.

[do-not-reply at jboss.org]

Author: ataylor
Date: 2010-12-02 03:44:21 -0500 (Thu, 02 Dec 2010)
New Revision: 9981

Modified:
   trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java
Log:
tidy up resources correctly

Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java	2010-12-02 08:41:46 UTC (rev 9980)
+++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java	2010-12-02 08:44:21 UTC (rev 9981)
@@ -41,6 +41,7 @@
    // Attributes ----------------------------------------------------
 
    private ClientSession session;
+   private ServerLocator locator;
 
    // Static --------------------------------------------------------
 
@@ -51,7 +52,6 @@
    @Override
    protected ClusterConnectionControl createManagementControl(final String name) throws Exception
    {
-      ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
       ClientSessionFactory sf = locator.createSessionFactory();
       session = sf.createSession(false, true, true);
       session.start();
@@ -150,7 +150,16 @@
 
    // Protected -----------------------------------------------------
 
+
    @Override
+   protected void setUp() throws Exception
+   {
+      super.setUp();
+
+      locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
+   }
+
+   @Override
    protected void tearDown() throws Exception
    {
       if (session != null)
@@ -158,6 +167,13 @@
          session.close();
       }
 
+      if(locator != null)
+      {
+         locator.close();
+      }
+
+      locator = null;
+
       session = null;
 
       super.tearDown();