[jboss-svn-commits] JBL Code SVN: r13365 - in labs/jbosstm/trunk: ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts and 1 other directory.

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

Author: adinn
Date: 2007-07-11 12:09:22 -0400 (Wed, 11 Jul 2007)
New Revision: 13365

Modified:
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java
   labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java
Log:
fix for JBTM-256 : modified TransactionImple::endSuspendedRMs to ensure all suspended resources are sent and end() even if one barfs

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java	2007-07-11 16:05:48 UTC (rev 13364)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java	2007-07-11 16:09:22 UTC (rev 13365)
@@ -1499,13 +1499,13 @@
 
 			if (el != null)
 			{
-				try
+				while (el.hasMoreElements())
 				{
 					/*
 					 * Would it gain us much to just loop for _suspendCount?
 					 */
 
-					while (el.hasMoreElements())
+					try
 					{
 						/*
 						 * Get the XAResource in case we have to call end on it.
@@ -1523,16 +1523,16 @@
 							info.setState(TxInfo.NOT_ASSOCIATED);
 						}
 					}
-				}
-				catch (XAException ex)
-				{
-					if (jtaLogger.loggerI18N.isWarnEnabled())
+					catch (XAException ex)
 					{
-						jtaLogger.loggerI18N
+					        if (jtaLogger.loggerI18N.isWarnEnabled())
+						{
+						    jtaLogger.loggerI18N
 								.warn("com.arjuna.ats.internal.jta.transaction.arjunacore.xaenderror");
+						}
+
+						result = false;
 					}
-
-					result = false;
 				}
 			}
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java	2007-07-11 16:05:48 UTC (rev 13364)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java	2007-07-11 16:09:22 UTC (rev 13365)
@@ -1448,9 +1448,9 @@
 
 			if (el != null)
 			{
-				try
+				while (el.hasMoreElements())
 				{
-					while (el.hasMoreElements())
+					try
 					{
 						/*
 						 * Get the XAResource in case we have to call end on it.
@@ -1468,15 +1468,15 @@
 							info.setState(TxInfo.NOT_ASSOCIATED);
 						}
 					}
-				}
-				catch (XAException ex)
-				{
-					if (jtaLogger.loggerI18N.isWarnEnabled())
+					catch (XAException ex)
 					{
-						jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaenderror");
+					        if (jtaLogger.loggerI18N.isWarnEnabled())
+						{
+						        jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.xaenderror");
+						}
+
+						result = false;
 					}
-
-					result = false;
 				}
 			}