[jboss-svn-commits] JBL Code SVN: r23857 - labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate.

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

Author: jhalliday
Date: 2008-11-13 09:37:43 -0500 (Thu, 13 Nov 2008)
New Revision: 23857

Modified:
   labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/SubordinateAtomicAction.java
Log:
Merged JBTM-423 update from trunk to 4.2.3.SP


Modified: labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/SubordinateAtomicAction.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/SubordinateAtomicAction.java	2008-11-13 14:14:55 UTC (rev 23856)
+++ labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/SubordinateAtomicAction.java	2008-11-13 14:37:43 UTC (rev 23857)
@@ -200,7 +200,18 @@
 
 	public int doOnePhaseCommit ()
 	{
-		return super.End(true);
+	    int status;
+	    
+	    if (beforeCompletion())
+	    {
+		status = super.End(true);
+	    }
+	    else
+	        status = ActionStatus.ABORTED;
+	              
+            afterCompletion(status);
+            
+            return status;
 	}
 
 	public void doForget ()