[jboss-svn-commits] JBL Code SVN: r37548 - 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 04:26:18 -0400 (Sat, 15 Oct 2011)
New Revision: 37548

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 ensure JCA subords are treated as they were before

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 08:24:56 UTC (rev 37547)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/TransactionImporterImple.java	2011-10-15 08:26:18 UTC (rev 37548)
@@ -40,6 +40,7 @@
 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
@@ -211,6 +212,9 @@
 		 */
 		@Override
 		public boolean equals(Object obj) {
+			if (_theXid.formatID != XATxConverter.FORMAT_ID) {
+				return super.equals(obj);
+			}
 			boolean toReturn = false;
 			if (obj instanceof SubordinateXidImple)
 			{
@@ -231,6 +235,9 @@
 			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);
 		}