[jboss-svn-commits] JBL Code SVN: r22815 - labs/jbosstm/trunk/XTS/sar/src/org/jboss/jbossts/xts/recovery.

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

Author: adinn
Date: 2008-09-16 09:49:53 -0400 (Tue, 16 Sep 2008)
New Revision: 22815

Modified:
   labs/jbosstm/trunk/XTS/sar/src/org/jboss/jbossts/xts/recovery/RecoverACCoordinator.java
Log:
fixed recovery so that _commmitted_ heuristic transactions get replayed, allowing them to resolve uncommitted participants

Modified: labs/jbosstm/trunk/XTS/sar/src/org/jboss/jbossts/xts/recovery/RecoverACCoordinator.java
===================================================================
--- labs/jbosstm/trunk/XTS/sar/src/org/jboss/jbossts/xts/recovery/RecoverACCoordinator.java	2008-09-16 13:48:17 UTC (rev 22814)
+++ labs/jbosstm/trunk/XTS/sar/src/org/jboss/jbossts/xts/recovery/RecoverACCoordinator.java	2008-09-16 13:49:53 UTC (rev 22815)
@@ -67,12 +67,22 @@
            // again it is pointless calling phase2Abort since the prepared list is empty. 
 
        if ((status == ActionStatus.PREPARED) ||
-               (status == ActionStatus.COMMITTING))
+               (status == ActionStatus.COMMITTING) ||
+               (status == ActionStatus.COMMITTED) ||
+               (status == ActionStatus.H_COMMIT) ||
+               (status == ActionStatus.H_MIXED) ||
+               (status == ActionStatus.H_HAZARD))
 	   {
 	       super.phase2Commit( _reportHeuristics ) ;
-	   }
+	   } else if ((status ==  ActionStatus.ABORTED) ||
+               (status == ActionStatus.H_ROLLBACK) ||
+               (status == ActionStatus.ABORTING) ||
+               (status == ActionStatus.ABORT_ONLY))
+       {
+           super.phase2Abort( _reportHeuristics ) ;
+       }
 
-	   if (XTSLogger.arjLoggerI18N.debugAllowed())
+       if (XTSLogger.arjLoggerI18N.debugAllowed())
 	   {
 	       XTSLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
 					    FacilityCode.FAC_CRASH_RECOVERY,