[hornetq-commits] JBoss hornetq SVN: r11016 - branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover.

[do-not-reply at jboss.org]

Author: borges
Date: 2011-07-22 09:52:26 -0400 (Fri, 22 Jul 2011)
New Revision: 11016

Modified:
   branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
Log:
Close the session Factory at tearDown

Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
===================================================================
--- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java	2011-07-22 02:38:58 UTC (rev 11015)
+++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java	2011-07-22 13:52:26 UTC (rev 11016)
@@ -101,6 +101,7 @@
    @Override
    protected void tearDown() throws Exception
    {
+      closeSessionFactory();
       locator.close();
       super.tearDown();
    }
@@ -302,7 +303,6 @@
 
       session.close();
 
-      closeSessionFactory();
    }
 
    // https://jira.jboss.org/jira/browse/HORNETQ-285
@@ -334,8 +334,6 @@
       receiveMessages(consumer);
 
       session.close();
-
-      closeSessionFactory();
    }
 
    public void testTransactedMessagesSentSoRollback() throws Exception
@@ -1356,7 +1354,6 @@
 
       session.close();
 
-      closeSessionFactory();
    }
 
    public void testCommitOccurredUnblockedAndResendNoDuplicates() throws Exception
@@ -1504,6 +1501,8 @@
 
    private void closeSessionFactory()
    {
+      if (sf == null)
+         return;
       sf.close();
       Assert.assertEquals(0, sf.numSessions());
       Assert.assertEquals(0, sf.numConnections());
@@ -1616,7 +1615,6 @@
 
       session2.close();
 
-      closeSessionFactory();
    }
 
    public void testBackupServerNotRemoved() throws Exception
@@ -1663,8 +1661,6 @@
       producer.send(message);
 
       session.close();
-
-      closeSessionFactory();
    }
 
    public void testLiveAndBackupLiveComesBack() throws Exception
@@ -1713,7 +1709,6 @@
 
       session.close();
 
-      closeSessionFactory();
    }
 
    public void testLiveAndBackupLiveComesBackNewFactory() throws Exception