[jboss-svn-commits] JBL Code SVN: r37752 - labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/jca.

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

Author: tomjenkinson
Date: 2011-12-01 03:14:49 -0500 (Thu, 01 Dec 2011)
New Revision: 37752

Modified:
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/jca/SubordinateAtomicAction.java
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/jca/TransactionImple.java
Log:
JBTM-895 add a check for a null xid, this is only needed for the tests

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/jca/SubordinateAtomicAction.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/jca/SubordinateAtomicAction.java	2011-11-30 22:23:39 UTC (rev 37751)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/jca/SubordinateAtomicAction.java	2011-12-01 08:14:49 UTC (rev 37752)
@@ -94,7 +94,7 @@
 	{
 		super(timeout); // implicit start (done in base class)
 		
-		if (xid.getFormatId() == XATxConverter.FORMAT_ID) {
+		if (xid != null && xid.getFormatId() == XATxConverter.FORMAT_ID) {
 			XidImple toImport = new XidImple(xid);
 			XID toCheck = toImport.getXID();
 			_parentNodeName = XATxConverter.getSubordinateNodeName(toCheck);

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/jca/TransactionImple.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/jca/TransactionImple.java	2011-11-30 22:23:39 UTC (rev 37751)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/jca/TransactionImple.java	2011-12-01 08:14:49 UTC (rev 37752)
@@ -44,6 +44,8 @@
 
 	/**
 	 * Create a new transaction with the specified timeout.
+	 * 
+	 * @deprecated Only used by tests
 	 */
 
 	public TransactionImple(int timeout)