[jboss-svn-commits] JBL Code SVN: r37563 - in labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats: jta/xa and 1 other directory.

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

Author: tomjenkinson
Date: 2011-10-16 17:20:56 -0400 (Sun, 16 Oct 2011)
New Revision: 37563

Modified:
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/TransactionImporterImple.java
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XATxConverter.java
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XidImple.java
Log:
JBTM-916 updated to ensure that we only set the subordinate details on subordinates

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/TransactionImporterImple.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/TransactionImporterImple.java	2011-10-16 12:03:18 UTC (rev 37562)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/TransactionImporterImple.java	2011-10-16 21:20:56 UTC (rev 37563)
@@ -91,7 +91,7 @@
 		if (imported == null)
 		{
 			imported = new TransactionImple(timeout, xid);
-
+			
 			_transactions.put(new SubordinateXidImple(xid), imported);
 		}
 

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XATxConverter.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XATxConverter.java	2011-10-16 12:03:18 UTC (rev 37562)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XATxConverter.java	2011-10-16 21:20:56 UTC (rev 37563)
@@ -126,10 +126,8 @@
             // src, srcPos, dest, destPos, length
             System.arraycopy (bqualUid, 0, xid.data, offset, bqualUid.length);
             offset = offset + bqualUid.length;
-            setSubordinateNodeName(xid, nodeName);
-            offset = offset + 4;
-            setParentNodeName(xid, nodeName);
-            offset = offset + 4;
+            offset = offset + 4; // Reserve space for parent node name
+            offset = offset + 4; // Reserve space for subordinate node name
             System.arraycopy (eisName, 0, xid.data, offset, eisNameLengthToUse);
         }
 		else

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XidImple.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XidImple.java	2011-10-16 12:03:18 UTC (rev 37562)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XidImple.java	2011-10-16 21:20:56 UTC (rev 37563)
@@ -74,6 +74,9 @@
 		// If this is a subordinate transaction and it is one of ours, bump up the parent node name
 		if (subordinate && _theXid.formatID == XATxConverter.FORMAT_ID) {
 			int parentNodeName = XATxConverter.getSubordinateNodeName(_theXid);
+			if (parentNodeName == 0) {
+				parentNodeName = XATxConverter.getNodeName(_theXid);
+			}
 			XATxConverter.setParentNodeName(_theXid, parentNodeName);
 			XATxConverter.setSubordinateNodeName(_theXid, TxControl.getXANodeName());
 		}
@@ -89,7 +92,7 @@
 	}
 
 	public XidImple(Xid xid, boolean branch, String eisName) {
-		this(xid, true);
+		this(xid, false);
 		if (branch) {
 			XATxConverter.setBranchUID(_theXid, new Uid());
 		}