[jboss-svn-commits] JBL Code SVN: r27523 - in labs/jbosstm/trunk/ArjunaCore/arjuna: tests/classes/com/hp/mwtests/ts/arjuna/recovery and 1 other directory.

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

Author: mark.little at jboss.com
Date: 2009-07-04 04:03:30 -0400 (Sat, 04 Jul 2009)
New Revision: 27523

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/DisposeRecord.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/DestroyRecoverTest.java
Log:
https://jira.jboss.org/jira/browse/JBTM-579 and https://jira.jboss.org/jira/browse/JBTM-576

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/DisposeRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/DisposeRecord.java	2009-07-04 07:36:13 UTC (rev 27522)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/DisposeRecord.java	2009-07-04 08:03:30 UTC (rev 27523)
@@ -209,8 +209,7 @@
     
     public boolean doSave ()
     {
-	//	return true;
-	return false;
+	return true;
     }
     
     /**

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/DestroyRecoverTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/DestroyRecoverTest.java	2009-07-04 07:36:13 UTC (rev 27522)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/DestroyRecoverTest.java	2009-07-04 08:03:30 UTC (rev 27523)
@@ -71,7 +71,7 @@
         if (passed) {
             try {
                 A = new AtomicAction();
-
+                
                 txId = A.get_uid();
 
                 A.begin();
@@ -104,6 +104,12 @@
 
                 tx.doCommit();
 
+                /*
+                 * Committing the recovered transaction should have disposed of the
+                 * user object, meaning activation will fail. Which for this test
+                 * is a successful outcome!
+                 */
+                
                 BasicObject recoveredObject = new BasicObject(objId);
 
                 if (recoveredObject.get() == -1)
@@ -113,7 +119,7 @@
                 ex.printStackTrace();
             }
         }
-
+        
         assertTrue(passed);
     }