[jboss-svn-commits] JBL Code SVN: r9703 - 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-22 11:46:27 -0500 (Thu, 22 Feb 2007)
New Revision: 9703

Modified:
   labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/TransactionImple.java
Log:
fixed try/catch problem.

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-22 16:32:10 UTC (rev 9702)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/TransactionImple.java	2007-02-22 16:46:27 UTC (rev 9703)
@@ -143,7 +143,16 @@
 			SubordinateAtomicTransaction subAct = (SubordinateAtomicTransaction) super._theTransaction;
 
 			if (!endSuspendedRMs())
-				_theTransaction.rollbackOnly();
+			{
+				try
+				{
+					_theTransaction.rollbackOnly();
+				}
+				catch (org.omg.CosTransactions.NoTransaction ex)
+				{
+					// shouldn't happen! ignore because prepare will fail next anyway.
+				}
+			}
 			
 			int res = subAct.doPrepare();
 			
@@ -298,8 +307,14 @@
 		{
 			SubordinateAtomicTransaction subAct = (SubordinateAtomicTransaction) super._theTransaction;
 
-			if (!endSuspendedRMs())
+			try
+			{
 				_theTransaction.rollbackOnly();
+			}
+			catch (org.omg.CosTransactions.NoTransaction ex)
+			{
+				// shouldn't happen! ignore because commit will fail next anyway.
+			}
 			
 			int status = subAct.doOnePhaseCommit();