[jboss-svn-commits] JBL Code SVN: r25502 - labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate.

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

Author: mark.little at jboss.com
Date: 2009-03-05 09:57:21 -0500 (Thu, 05 Mar 2009)
New Revision: 25502

Modified:
   labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/SubordinateAtomicTransaction.java
Log:
https://jira.jboss.org/jira/browse/JBTM-504

Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/SubordinateAtomicTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/SubordinateAtomicTransaction.java	2009-03-05 13:56:59 UTC (rev 25501)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/SubordinateAtomicTransaction.java	2009-03-05 14:57:21 UTC (rev 25502)
@@ -152,26 +152,14 @@
 	
 	public int doOnePhaseCommit () throws SystemException
 	{
+	    // https://jira.jboss.org/jira/browse/JBTM-504
+	    
 		try
 		{
-			int res = doPrepare();
-			
-			switch (res)
-			{
-				case TwoPhaseOutcome.PREPARE_OK:
-					doCommit();
-					break;
-				case TwoPhaseOutcome.PREPARE_NOTOK:
-					doRollback();
-				
-					return TwoPhaseOutcome.HEURISTIC_ROLLBACK;
-				case TwoPhaseOutcome.PREPARE_READONLY:
-					return TwoPhaseOutcome.FINISH_OK;
-				default:
-					doRollback();
-				
-					return res;
-			}
+		    ServerTransaction stx = getTransaction();
+   
+		        if (stx != null)
+		            stx.doCommit();
 		}
 		catch (Exception ex)
 		{
@@ -179,8 +167,6 @@
 		}
 		
 		return TwoPhaseOutcome.FINISH_OK;
-		
-		// TODO error
 	}
 	
 	public void doForget () throws SystemException