[jboss-cvs] JBossAS SVN: r97477 - in trunk/testsuite/src/main/org/jboss/test/jca: test and 1 other directory.

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

Author: smcgowan at redhat.com
Date: 2009-12-04 15:31:52 -0500 (Fri, 04 Dec 2009)
New Revision: 97477

Modified:
   trunk/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java
   trunk/testsuite/src/main/org/jboss/test/jca/test/TxConnectionManagerUnitTestCase.java
Log:
JBAS-7494, JBAS-7595

Modified: trunk/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java	2009-12-04 20:14:13 UTC (rev 97476)
+++ trunk/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java	2009-12-04 20:31:52 UTC (rev 97477)
@@ -23,6 +23,7 @@
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -654,12 +655,9 @@
       public GlobalXID(Xid xid)
       {
          gid = xid.getGlobalTransactionId();
+         hashCode = Arrays.hashCode(gid);
+      } 
 
-         for (int i = 0; i < gid.length; ++i)
-            hashCode += 37 * gid[i];
-         toString = new String(gid).trim();
-      }
-
       public int hashCode()
       {
          return hashCode;
@@ -675,7 +673,7 @@
          if (obj == null || obj instanceof GlobalXID == false)
             return false;
          GlobalXID other = (GlobalXID) obj;
-         return toString.equals(other.toString);
+         return Arrays.equals(gid, other.gid); 
       }
    }
 }

Modified: trunk/testsuite/src/main/org/jboss/test/jca/test/TxConnectionManagerUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/test/TxConnectionManagerUnitTestCase.java	2009-12-04 20:14:13 UTC (rev 97476)
+++ trunk/testsuite/src/main/org/jboss/test/jca/test/TxConnectionManagerUnitTestCase.java	2009-12-04 20:31:52 UTC (rev 97477)
@@ -134,7 +134,7 @@
       JBossManagedConnectionPool.OnePool pool = (JBossManagedConnectionPool.OnePool)cm.getPoolingStrategy();
       pool.shutdown();
 
-      tm.setTransactionTimeout(txTimeout);
+      tm.setTransactionTimeout(0);
       tm = null;
       cm = null;
       mcf = null;