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

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

Author: tomjenkinson
Date: 2011-10-15 18:08:45 -0400 (Sat, 15 Oct 2011)
New Revision: 37557

Added:
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/SubordinateXidImple.java
Modified:
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/TransactionImporterImple.java
Log:
JBTM-916 updated to split out the XidImple into its own class

Added: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/SubordinateXidImple.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/SubordinateXidImple.java	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/SubordinateXidImple.java	2011-10-15 22:08:45 UTC (rev 37557)
@@ -0,0 +1,48 @@
+package com.arjuna.ats.internal.jta.transaction.arjunacore.jca;
+
+import javax.transaction.xa.Xid;
+
+import com.arjuna.ats.internal.jta.xa.XID;
+import com.arjuna.ats.jta.xa.XATxConverter;
+import com.arjuna.ats.jta.xa.XidImple;
+
+public class SubordinateXidImple extends XidImple {
+	public SubordinateXidImple(Xid xid) {
+		super(xid);
+	}
+
+	/**
+	 * Test equality as being part of the same global transaction
+	 */
+	@Override
+	public boolean equals(Object obj) {
+		if (_theXid.formatID != XATxConverter.FORMAT_ID) {
+			return super.equals(obj);
+		}
+		boolean toReturn = false;
+		if (obj instanceof SubordinateXidImple) {
+			toReturn = isSameTransaction(((SubordinateXidImple) obj));
+		}
+		return toReturn;
+	}
+
+	/**
+	 * Generate the hash code for the xid, subordinates are diffed on the gtrid
+	 * only.
+	 * 
+	 * @param xid
+	 *            The xid.
+	 * @return The hash code.
+	 */
+	@Override
+	protected int getHash(final XID xid) {
+		if (xid == null) {
+			return 0;
+		}
+		if (_theXid.formatID != XATxConverter.FORMAT_ID) {
+			return super.getHash(xid);
+		}
+		return generateHash(xid.formatID, xid.data, 0, xid.gtrid_length);
+	}
+
+}

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-15 18:00:22 UTC (rev 37556)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/TransactionImporterImple.java	2011-10-15 22:08:45 UTC (rev 37557)
@@ -31,7 +31,6 @@
 
 package com.arjuna.ats.internal.jta.transaction.arjunacore.jca;
 
-import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.transaction.xa.XAException;
@@ -39,9 +38,6 @@
 
 import com.arjuna.ats.arjuna.common.Uid;
 import com.arjuna.ats.internal.jta.transaction.arjunacore.subordinate.jca.TransactionImple;
-import com.arjuna.ats.internal.jta.xa.XID;
-import com.arjuna.ats.jta.xa.XATxConverter;
-import com.arjuna.ats.jta.xa.XidImple;
 
 public class TransactionImporterImple implements TransactionImporter
 {
@@ -201,48 +197,5 @@
 	}
 
 	private static ConcurrentHashMap<SubordinateXidImple, SubordinateTransaction> _transactions = new ConcurrentHashMap<SubordinateXidImple, SubordinateTransaction>();
-	
-	private class SubordinateXidImple extends XidImple {
-		public SubordinateXidImple(Xid xid) {
-			super(xid);
-		}
-
-		/**
-		 * Test equality as being part of the same global transaction
-		 */
-		@Override
-		public boolean equals(Object obj) {
-			if (_theXid.formatID != XATxConverter.FORMAT_ID) {
-				return super.equals(obj);
-			}
-			boolean toReturn = false;
-			if (obj instanceof SubordinateXidImple)
-			{
-				toReturn = isSameTransaction(((SubordinateXidImple)obj));
-			}
-			return toReturn;
-		}
-
-		/**
-		 * Generate the hash code for the xid, subordinates are diffed on the gtrid only.
-		 * 
-		 * @param xid
-		 *            The xid.
-		 * @return The hash code.
-		 */
-		@Override
-		protected int getHash(final XID xid) {
-			if (xid == null) {
-				return 0;
-			}
-			if (_theXid.formatID != XATxConverter.FORMAT_ID) {
-				return super.getHash(xid);
-			}
-			return generateHash(xid.formatID, xid.data, 0,
-					xid.gtrid_length);
-		}
-		
-	}
-
 }