[jboss-svn-commits] JBL Code SVN: r9647 - 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: 2007-02-20 08:56:55 -0500 (Tue, 20 Feb 2007)
New Revision: 9647

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

Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/TransactionImple.java	2007-02-20 13:55:45 UTC (rev 9646)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/TransactionImple.java	2007-02-20 13:56:55 UTC (rev 9647)
@@ -142,6 +142,9 @@
 		{
 			SubordinateAtomicTransaction subAct = (SubordinateAtomicTransaction) super._theTransaction;
 
+			if (!endSuspendedRMs())
+				_theTransaction.rollbackOnly();
+			
 			int res = subAct.doPrepare();
 			
 			switch (res)
@@ -242,6 +245,14 @@
 		{
 			SubordinateAtomicTransaction subAct = (SubordinateAtomicTransaction) 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)
@@ -287,6 +298,9 @@
 		{
 			SubordinateAtomicTransaction subAct = (SubordinateAtomicTransaction) super._theTransaction;
 
+			if (!endSuspendedRMs())
+				_theTransaction.rollbackOnly();
+			
 			int status = subAct.doOnePhaseCommit();
 
 			TransactionImple.removeTransaction(this);