[jboss-svn-commits] JBL Code SVN: r32821 - labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore.

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

Author: jhalliday
Date: 2010-05-11 09:32:35 -0400 (Tue, 11 May 2010)
New Revision: 32821

Modified:
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java
Log:
Backport XARecoveryModule debug logging fix. JBTM-594


Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java	2010-05-11 13:18:51 UTC (rev 32820)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java	2010-05-11 13:32:35 UTC (rev 32821)
@@ -749,6 +749,8 @@
 	 *          caught {1}
 	 * @message com.arjuna.ats.internal.jta.recovery.info.rollingback Rolling
 	 *          back {0}
+	 * @message com.arjuna.ats.internal.jta.recovery.info.rollingbackignore Ignoring
+         *          Xid {0} and leaving for transaction recovery to drive.
 	 * @message com.arjuna.ats.internal.jta.recovery.info.notrollback Told not
 	 *          to rollback {0}
 	 */
@@ -1004,28 +1006,40 @@
 
 							try
 							{
-								if (doRecovery)
-								{
-									if (jtaLogger.loggerI18N.isInfoEnabled())
-									{
-										jtaLogger.loggerI18N
-												.info(
-														"com.arjuna.ats.internal.jta.recovery.info.rollingback",
-														new Object[]
-														{ XAHelper
-																.xidToString((Xid) xids[j]) });
-									}
+                                if (doRecovery)
+                                {
+                                    if (!transactionLog((Xid) xids[j]))
+                                    {
+                                        if (jtaLogger.loggerI18N.isInfoEnabled())
+                                        {
+                                            jtaLogger.loggerI18N
+                                                    .info(
+                                                            "com.arjuna.ats.internal.jta.recovery.info.rollingback",
+                                                            new Object[]
+                                                                    { XAHelper
+                                                                            .xidToString((Xid) xids[j]) });
+                                        }
 
-									if (!transactionLog((Xid) xids[j]))
-										xares.rollback((Xid) xids[j]);
-									else
-									{
-										/*
-										 * Ignore it as the transaction system
-										 * will recovery it eventually.
-										 */
-									}
-								}
+                                        xares.rollback((Xid) xids[j]);
+                                    }
+                                    else
+                                    {
+                                        if (jtaLogger.loggerI18N.isInfoEnabled())
+                                        {
+                                            jtaLogger.loggerI18N
+                                                    .info(
+                                                            "com.arjuna.ats.internal.jta.recovery.info.rollingbackignore",
+                                                            new Object[]
+                                                                    { XAHelper
+                                                                            .xidToString((Xid) xids[j]) });
+                                        }
+
+                                        /*
+                                                   * Ignore it as the transaction system
+                                                   * will recovery it eventually.
+                                                   */
+                                    }
+                                }
 								else
 								{
 									if (jtaLogger.loggerI18N.isInfoEnabled())