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

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

Author: mark.little at jboss.com
Date: 2009-07-23 07:58:09 -0400 (Thu, 23 Jul 2009)
New Revision: 28332

Modified:
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java
Log:
Improved debug messages around Xid recovery.

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java	2009-07-23 11:10:04 UTC (rev 28331)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java	2009-07-23 11:58:09 UTC (rev 28332)
@@ -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,20 +1006,32 @@
 							{
 								if (doRecovery)
 								{
-									if (jtaLogger.loggerI18N.isInfoEnabled())
+									if (!transactionLog((Xid) xids[j]))
 									{
-										jtaLogger.loggerI18N
-												.info(
-														"com.arjuna.ats.internal.jta.recovery.info.rollingback",
-														new Object[]
-														{ XAHelper
-																.xidToString((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]) });
+	                                                                        }
+									    
+										xares.rollback((Xid) xids[j]);
 									}
-
-									if (!transactionLog((Xid) xids[j]))
-										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.