[jboss-svn-commits] JBL Code SVN: r37681 - labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/twophase.

[jboss-svn-commits at lists.jboss.org]

Author: tomjenkinson
Date: 2011-10-27 04:29:26 -0400 (Thu, 27 Oct 2011)
New Revision: 37681

Modified:
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/twophase/TransactionImpleUnitTest.java
Log:
getting the project to build on JDK7 required some changes to ensure a test was cleaned up properly in trunk as Maven runs the tests in a different order to the ant junit runner. I have backported the fix incase users attempt to run our tests in an order where the cleanup has not occured

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/twophase/TransactionImpleUnitTest.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/twophase/TransactionImpleUnitTest.java	2011-10-27 08:17:37 UTC (rev 37680)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/twophase/TransactionImpleUnitTest.java	2011-10-27 08:29:26 UTC (rev 37681)
@@ -99,6 +99,7 @@
     @Test
     public void test () throws Exception
     {
+        ThreadActionData.purgeActions();
         TransactionImple tx = new TransactionImple(0);
         
         TxImpleOverride.put(tx);
@@ -162,11 +163,13 @@
         assertFalse(res.booleanValue());
         
         tx.rollback();
+        ThreadActionData.purgeActions();
     }
     
     @Test
     public void testXidCreation () throws Exception
     {
+        ThreadActionData.purgeActions();
         Class[] parameterTypes = new Class[3];
         TransactionImple tx = new TransactionImple(0);