[jboss-svn-commits] JBL Code SVN: r37582 - in labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta: classes/com/arjuna/ats/internal/jta/utils and 2 other directories.

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

Author: tomjenkinson
Date: 2011-10-17 16:57:14 -0400 (Mon, 17 Oct 2011)
New Revision: 37582

Modified:
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/SubordinateJTAXAResourceOrphanFilter.java
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/utils/XAUtils.java
   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/tests/classes/com/hp/mwtests/ts/jta/xa/xidcheck.java
Log:
JBTM-916 updated to send requests for node information from the Xid to the XATxConverter

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/SubordinateJTAXAResourceOrphanFilter.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/SubordinateJTAXAResourceOrphanFilter.java	2011-10-17 20:24:22 UTC (rev 37581)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/SubordinateJTAXAResourceOrphanFilter.java	2011-10-17 20:57:14 UTC (rev 37582)
@@ -33,11 +33,11 @@
 import com.arjuna.ats.arjuna.state.InputObjectState;
 import com.arjuna.ats.internal.arjuna.common.UidHelper;
 import com.arjuna.ats.internal.jta.transaction.arjunacore.subordinate.jca.SubordinateAtomicAction;
-import com.arjuna.ats.internal.jta.utils.XAUtils;
 import com.arjuna.ats.jta.common.jtaPropertyManager;
 import com.arjuna.ats.jta.logging.jtaLogger;
 import com.arjuna.ats.jta.recovery.XAResourceOrphanFilter;
 import com.arjuna.ats.jta.utils.XAHelper;
+import com.arjuna.ats.jta.xa.XATxConverter;
 import com.arjuna.ats.jta.xa.XidImple;
 
 /**
@@ -56,7 +56,7 @@
 			return Vote.ABSTAIN;
 		}
 
-		int nodeName = XAUtils.getSubordinateNodeName(xid);
+		int nodeName = XATxConverter.getSubordinateNodeName(new XidImple(xid).getXID());
 
 		if (jtaLogger.logger.isDebugEnabled()) {
 			jtaLogger.logger.debug("subordinate node name of " + xid + " is " + nodeName);
@@ -120,7 +120,7 @@
 
 						if (uid.notEquals(Uid.nullUid())) {
 							SubordinateAtomicAction tx = new SubordinateAtomicAction(uid, true);
-							if (((XidImple)tx.getXid()).isSameTransaction(xid)) {
+							if (((XidImple) tx.getXid()).isSameTransaction(xid)) {
 								if (jtaLogger.logger.isDebugEnabled()) {
 									jtaLogger.logger.debug("Found record for " + theXid);
 								}

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/utils/XAUtils.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/utils/XAUtils.java	2011-10-17 20:24:22 UTC (rev 37581)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/utils/XAUtils.java	2011-10-17 20:57:14 UTC (rev 37582)
@@ -31,10 +31,12 @@
 
 package com.arjuna.ats.internal.jta.utils;
 
+import javax.transaction.xa.XAResource;
+import javax.transaction.xa.Xid;
+
+import com.arjuna.ats.jta.xa.XATxConverter;
 import com.arjuna.ats.jta.xa.XidImple;
 
-import javax.transaction.xa.*;
-
 /**
  * @author Mark Little (mark.little at arjuna.com)
  * @version $Id: XAUtils.java 2342 2006-03-30 13:06:17Z  $
@@ -82,18 +84,8 @@
         } else {
             xidImple = new XidImple(xid);
         }
-        return xidImple.getNodeName();
+        return XATxConverter.getNodeName(xidImple.getXID());
 	}
 
-	public static int getSubordinateNodeName(Xid xid) {
-        XidImple xidImple;
-        if(xid instanceof XidImple) {
-            xidImple = (XidImple)xid;
-        } else {
-            xidImple = new XidImple(xid);
-        }
-        return xidImple.getSubordinateNodeName();
-	}
-
 	private static final String ORACLE = "oracle";
 }

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-17 20:24:22 UTC (rev 37581)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/xa/XidImple.java	2011-10-17 20:57:14 UTC (rev 37582)
@@ -185,18 +185,6 @@
 		return XATxConverter.getUid(_theXid);
 	}
 
-	public final int getNodeName() {
-		return XATxConverter.getNodeName(_theXid);
-	}
-
-	public final int getSubordinateNodeName() {
-		return XATxConverter.getSubordinateNodeName(_theXid);
-	}
-
-	public final int getParentNodeName() {
-		return XATxConverter.getParentNodeName(_theXid);
-	}
-
 	public final XID getXID() {
 		return _theXid;
 	}

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/xa/xidcheck.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/xa/xidcheck.java	2011-10-17 20:24:22 UTC (rev 37581)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/xa/xidcheck.java	2011-10-17 20:57:14 UTC (rev 37582)
@@ -36,6 +36,7 @@
 import com.arjuna.ats.arjuna.state.InputObjectState;
 import com.arjuna.ats.arjuna.state.OutputObjectState;
 import com.arjuna.ats.internal.jta.xa.XID;
+import com.arjuna.ats.jta.xa.XATxConverter;
 import com.arjuna.ats.jta.xa.XidImple;
 
 import org.junit.Test;
@@ -82,7 +83,7 @@
         
         assertEquals(xid1.getTransactionUid(), A.get_uid());
         
-        assertTrue(xid1.getNodeName() == 1);
+        assertTrue(XATxConverter.getNodeName(xid1.getXID()) == 1);
         
         assertTrue(xid1.getXID() != null);