[jboss-svn-commits] JBL Code SVN: r11515 - 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-04-30 15:18:43 -0400 (Mon, 30 Apr 2007)
New Revision: 11515

Modified:
   labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/TransactionImple.java
Log:
missed if statement around rollbackOnly.

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-04-30 17:45:18 UTC (rev 11514)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/TransactionImple.java	2007-04-30 19:18:43 UTC (rev 11515)
@@ -307,14 +307,17 @@
 		{
 			SubordinateAtomicTransaction subAct = (SubordinateAtomicTransaction) super._theTransaction;
 
-			try
+			if (!endSuspendedRMs())
 			{
-				_theTransaction.rollbackOnly();
+        			try
+        			{
+        				_theTransaction.rollbackOnly();
+        			}
+        			catch (org.omg.CosTransactions.NoTransaction ex)
+        			{
+        				// shouldn't happen! ignore because commit will fail next anyway.
+        			}
 			}
-			catch (org.omg.CosTransactions.NoTransaction ex)
-			{
-				// shouldn't happen! ignore because commit will fail next anyway.
-			}
 			
 			int status = subAct.doOnePhaseCommit();