[hornetq-commits] JBoss hornetq SVN: r9442 - in branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration: largemessage and 1 other directory.

[do-not-reply at jboss.org]

Author: ataylor
Date: 2010-07-21 05:32:32 -0400 (Wed, 21 Jul 2010)
New Revision: 9442

Modified:
   branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java
   branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java
   branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java
Log:
test fixes

Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java	2010-07-21 07:21:57 UTC (rev 9441)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java	2010-07-21 09:32:32 UTC (rev 9442)
@@ -385,7 +385,8 @@
          server.stop();
 
          server.start();
-
+         //we need to recreate the locator and session factory
+         sf = locator.createSessionFactory();
          jmxServer = ManagementControlHelper.createHornetQServerControl(mbeanServer);
          if (heuristicCommit)
          {
@@ -493,7 +494,8 @@
          server.stop();
 
          server.start();
-
+         //we need to recreate the sf
+         sf = locator.createSessionFactory();
          session = sf.createSession(true, false, false);
          Xid[] recoveredXids = session.recover(XAResource.TMSTARTRSCAN);
          Assert.assertEquals(0, recoveredXids.length);

Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java	2010-07-21 07:21:57 UTC (rev 9441)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java	2010-07-21 09:32:32 UTC (rev 9442)
@@ -2082,7 +2082,7 @@
             session.close();
             server.stop();
             server.start();
-
+            sf = locator.createSessionFactory();
             session = sf.createSession(isXA, false, false);
 
             session.rollback(xid);

Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java	2010-07-21 07:21:57 UTC (rev 9441)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java	2010-07-21 09:32:32 UTC (rev 9442)
@@ -192,6 +192,7 @@
                {
                   server.stop();
                   server.start();
+                  sf = locator.createSessionFactory();
                }
 
                session = sf.createSession(null, null, isXA, false, false, preAck, 0);
@@ -226,6 +227,8 @@
             {
                server.stop();
                server.start();
+               //we need to recreate sf's
+               sf = locator.createSessionFactory();
             }
 
             session = sf.createSession(null, null, isXA, false, false, preAck, 0);