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

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

Author: tomjenkinson
Date: 2011-10-20 04:06:39 -0400 (Thu, 20 Oct 2011)
New Revision: 37625

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/tests/classes/com/arjuna/ats/jta/xa/XATxConverterTest.java
Log:
JBTM-916 return the correct type for the parent node name

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-20 08:05:37 UTC (rev 37624)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XATxConverter.java	2011-10-20 08:06:39 UTC (rev 37625)
@@ -158,7 +158,7 @@
         return tx;
     }
 
-	public static int getNodeName(XID xid) {
+	public static Integer getNodeName(XID xid) {
 		// Arjuna.XID()
 		// don't check the formatId - it may differ e.g. JTA vs. JTS.
 		if (xid.formatID != FORMAT_ID && xid.formatID != 131072
@@ -176,14 +176,14 @@
 				+ (xid.data[offset + 3] & 0xFF);
 	}
 
-	public static void setSubordinateNodeName(XID theXid, int xaNodeName) {
+	public static void setSubordinateNodeName(XID theXid, Integer xaNodeName) {
 		int offset = theXid.gtrid_length + Uid.UID_SIZE;
 		theXid.data[offset + 0] = (byte) (xaNodeName >>> 24);
 		theXid.data[offset + 1] = (byte) (xaNodeName >>> 16);
 		theXid.data[offset + 2] = (byte) (xaNodeName >>> 8);
 		theXid.data[offset + 3] = (byte) (xaNodeName >>> 0);
 	}
-	public static int getSubordinateNodeName(XID xid) {
+	public static Integer getSubordinateNodeName(XID xid) {
 		// Arjuna.XID()
 		// don't check the formatId - it may differ e.g. JTA vs. JTS.
 		if (xid.formatID != FORMAT_ID && xid.formatID != 131072
@@ -203,7 +203,7 @@
 
 
 
-	public static void setParentNodeName(XID theXid, int parentNodeName) {
+	public static void setParentNodeName(XID theXid, Integer parentNodeName) {
 		int offset = theXid.gtrid_length + Uid.UID_SIZE + 4;
 		theXid.data[offset + 0] = (byte) (parentNodeName >>> 24);
 		theXid.data[offset + 1] = (byte) (parentNodeName >>> 16);
@@ -211,7 +211,7 @@
 		theXid.data[offset + 3] = (byte) (parentNodeName >>> 0);
 		
 	}
-	public static int getParentNodeName(XID xid) {
+	public static Integer getParentNodeName(XID xid) {
 		// Arjuna.XID()
 		// don't check the formatId - it may differ e.g. JTA vs. JTS.
 		if (xid.formatID != FORMAT_ID && xid.formatID != 131072

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/tests/classes/com/arjuna/ats/jta/xa/XATxConverterTest.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/tests/classes/com/arjuna/ats/jta/xa/XATxConverterTest.java	2011-10-20 08:05:37 UTC (rev 37624)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/tests/classes/com/arjuna/ats/jta/xa/XATxConverterTest.java	2011-10-20 08:06:39 UTC (rev 37625)
@@ -22,19 +22,19 @@
 
 		XidImple rootXid = new XidImple(uid, branch, eisName);
 		{
-			assertEquals(XATxConverter.getNodeName(rootXid.getXID()), 1);
+			assertEquals(XATxConverter.getNodeName(rootXid.getXID()), new Integer(1));
 			assertEquals(XATxConverter.getEISName(rootXid.getXID()), eisName);
-			assertEquals(XATxConverter.getSubordinateNodeName(rootXid.getXID()), 0);
-			assertEquals(XATxConverter.getParentNodeName(rootXid.getXID()), 0);
+			assertEquals(XATxConverter.getSubordinateNodeName(rootXid.getXID()), new Integer(0));
+			assertEquals(XATxConverter.getParentNodeName(rootXid.getXID()), new Integer(0));
 		}
 
 		TxControl.setXANodeName(2);
 		XidImple subordinateXid = new XidImple(rootXid, true);
 		{
-			assertEquals(XATxConverter.getNodeName(subordinateXid.getXID()), 1);
+			assertEquals(XATxConverter.getNodeName(subordinateXid.getXID()), new Integer(1));
 			assertEquals(XATxConverter.getEISName(subordinateXid.getXID()), eisName);
-			assertEquals(XATxConverter.getSubordinateNodeName(subordinateXid.getXID()), 2);
-			assertEquals(XATxConverter.getParentNodeName(subordinateXid.getXID()), 1);
+			assertEquals(XATxConverter.getSubordinateNodeName(subordinateXid.getXID()), new Integer(2));
+			assertEquals(XATxConverter.getParentNodeName(subordinateXid.getXID()), new Integer(1));
 		}
 	}
 
@@ -42,10 +42,10 @@
 	public void testForeignXID() {
 		XidImple foreignXidImple = new XidImple(new MyForeignXID());
 
-		assertEquals(XATxConverter.getNodeName(foreignXidImple.getXID()), -1);
+		assertEquals(XATxConverter.getNodeName(foreignXidImple.getXID()), new Integer(-1));
 		assertEquals(XATxConverter.getEISName(foreignXidImple.getXID()), "unknown eis name");
-		assertEquals(XATxConverter.getSubordinateNodeName(foreignXidImple.getXID()), -1);
-		assertEquals(XATxConverter.getParentNodeName(foreignXidImple.getXID()), -1);
+		assertEquals(XATxConverter.getSubordinateNodeName(foreignXidImple.getXID()), new Integer(-1));
+		assertEquals(XATxConverter.getParentNodeName(foreignXidImple.getXID()), new Integer(-1));
 	}
 
 	private class MyForeignXID implements Xid {