[jboss-svn-commits] JBL Code SVN: r6513 - in labs/jbosstm/trunk: ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific

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

Author: mark.little at jboss.com
Date: 2006-10-01 18:33:02 -0400 (Sun, 01 Oct 2006)
New Revision: 6513

Modified:
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java
   labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java
Log:
http://jira.jboss.com/jira/browse/JBTM-92

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java	2006-10-01 22:11:18 UTC (rev 6512)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java	2006-10-01 22:33:02 UTC (rev 6513)
@@ -214,6 +214,9 @@
 	 * @message com.arjuna.ats.internal.jta.resources.arjunacore.preparenulltx
 	 *          [com.arjuna.ats.internal.jta.resources.arjunacore.preparenulltx]
 	 *          {0} - null transaction!
+	 * @message com.arjuna.ats.internal.jta.resources.arjunacore.preparefailed
+	 * 			[com.arjuna.ats.internal.jta.resources.arjunacore.preparefailed]
+	 * 			{0} - prepare failed with exception {1}
 	 */
 
 	public int topLevelPrepare()
@@ -267,6 +270,16 @@
 		}
 		catch (XAException e1)
 		{
+			if (jtaLogger.loggerI18N.isWarnEnabled())
+			{
+				jtaLogger.loggerI18N
+						.warn(
+								"com.arjuna.ats.internal.jta.resources.arjunacore.preparefailed",
+								new Object[]
+								{ "XAResourceRecord.prepare", XAHelper
+										.printXAErrorCode(e1) });
+			}
+			
 			/*
 			 * XA_RB*, XAER_RMERR, XAER_RMFAIL, XAER_NOTA, XAER_INVAL, or
 			 * XAER_PROTO.
@@ -279,10 +292,14 @@
 		}
 		catch (Exception e2)
 		{
-			/*
-			 * XA_RB*, XAER_RMERR, XAER_RMFAIL, XAER_NOTA, XAER_INVAL, or
-			 * XAER_PROTO.
-			 */
+			if (jtaLogger.loggerI18N.isWarnEnabled())
+			{
+				jtaLogger.loggerI18N
+						.warn(
+								"com.arjuna.ats.internal.jta.resources.arjunacore.preparefailed",
+								new Object[]
+								{ "XAResourceRecord.prepare", e2 });
+			}
 
 			if (_rollbackOptimization) // won't have rollback called on it
 				removeConnection();

Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java	2006-10-01 22:11:18 UTC (rev 6512)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java	2006-10-01 22:33:02 UTC (rev 6513)
@@ -184,6 +184,12 @@
 		return _tranID;
 	}
 
+	/**
+	 * @message com.arjuna.ats.internal.jta.resources.jts.orbspecific.preparefailed
+	 *          [com.arjuna.ats.internal.jta.resources.jts.orbspecific.preparefailed]
+	 *          XAResource prepare failed with: {1}
+	 */
+	
 	public org.omg.CosTransactions.Vote prepare() throws HeuristicMixed,
 			HeuristicHazard, org.omg.CORBA.SystemException
 	{
@@ -261,6 +267,16 @@
 		}
 		catch (XAException e1)
 		{
+			if (jtaLogger.loggerI18N.isWarnEnabled())
+			{
+				jtaLogger.loggerI18N
+						.warn(
+								"com.arjuna.ats.internal.jta.resources.jts.orbspecific.preparefailed",
+								new Object[]
+								{ XAHelper
+										.printXAErrorCode(e1) });
+			}
+			
 			/*
 			 * XA_RB*, XAER_RMERR, XAER_RMFAIL, XAER_NOTA, XAER_INVAL, or
 			 * XAER_PROTO.
@@ -273,10 +289,14 @@
 		}
 		catch (Exception e2)
 		{
-			/*
-			 * XA_RB*, XAER_RMERR, XAER_RMFAIL, XAER_NOTA, XAER_INVAL, or
-			 * XAER_PROTO.
-			 */
+			if (jtaLogger.loggerI18N.isWarnEnabled())
+			{
+				jtaLogger.loggerI18N
+						.warn(
+								"com.arjuna.ats.internal.jta.resources.jts.orbspecific.preparefailed",
+								new Object[]
+								{ e2 });
+			}
 
 			if (_rollbackOptimization) // won't have rollback called on it
 				removeConnection();