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

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

Author: mark.little at jboss.com
Date: 2007-02-20 09:03:42 -0500 (Tue, 20 Feb 2007)
New Revision: 9649

Modified:
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/TransactionImple.java
Log:
http://jira.jboss.com/jira/browse/JBTM-202

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/TransactionImple.java	2007-02-20 14:01:43 UTC (rev 9648)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/TransactionImple.java	2007-02-20 14:03:42 UTC (rev 9649)
@@ -60,7 +60,6 @@
 	 * Create a new transaction with the specified timeout.
 	 */
 
-
 	public TransactionImple (int timeout)
 	{
 		this(new SubordinateAtomicAction(timeout));
@@ -135,6 +134,9 @@
 		{
 			SubordinateAtomicAction subAct = (SubordinateAtomicAction) super._theTransaction;
 
+			if (!endSuspendedRMs())
+				_theTransaction.preventCommit();
+			
 			int res = subAct.doPrepare();
 
 			switch (res)
@@ -205,6 +207,14 @@
 		{
 			SubordinateAtomicAction subAct = (SubordinateAtomicAction) super._theTransaction;
 
+			if (!endSuspendedRMs())
+			{
+				if (jtaLogger.loggerI18N.isWarnEnabled())
+				{
+					jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.endsuspendfailed1");
+				}
+			}
+			
 			int res = subAct.doRollback();
 
 			switch (res)
@@ -257,6 +267,9 @@
 		{
 			SubordinateAtomicAction subAct = (SubordinateAtomicAction) super._theTransaction;
 
+			if (endSuspendedRMs())
+				_theTransaction.preventCommit();
+			
 			int status = subAct.doOnePhaseCommit();		
 
 			switch (status)