[jboss-svn-commits] JBL Code SVN: r12234 - in labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP: ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts and 1 other directories.

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

Author: jhalliday
Date: 2007-05-30 07:57:39 -0400 (Wed, 30 May 2007)
New Revision: 12234

Added:
   labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/ext/concurrent.jar
Modified:
   labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java
   labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java
   labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/ext/Readme
Log:
Ported concurrency enhancements from trunk to the 4.2.3 branch. (JBTM-218)


Modified: labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java	2007-05-30 11:32:09 UTC (rev 12233)
+++ labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java	2007-05-30 11:57:39 UTC (rev 12234)
@@ -60,6 +60,8 @@
 import javax.transaction.RollbackException;
 import java.lang.IllegalStateException;
 
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+
 /*
  * Is given an AtomicAction, but uses the TwoPhaseCoordinator aspects of it
  * to ensure that the thread association continues.
@@ -1699,6 +1701,6 @@
                 }
 	}
 
-	private static Hashtable _transactions = new Hashtable();
+    private static ConcurrentHashMap _transactions = new ConcurrentHashMap();
 
 }

Modified: labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java	2007-05-30 11:32:09 UTC (rev 12233)
+++ labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java	2007-05-30 11:57:39 UTC (rev 12234)
@@ -64,6 +64,8 @@
 
 import com.arjuna.ats.arjuna.common.*;
 
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+
 import java.util.Hashtable;
 import java.util.Enumeration;
 
@@ -1771,6 +1773,6 @@
                 }
 	}
 
-	private static Hashtable _transactions = new Hashtable();
+    private static ConcurrentHashMap _transactions = new ConcurrentHashMap();
 
 }

Modified: labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/ext/Readme
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/ext/Readme	2007-05-30 11:32:09 UTC (rev 12233)
+++ labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/ext/Readme	2007-05-30 11:57:39 UTC (rev 12234)
@@ -39,3 +39,4 @@
 xalan.jar
 xercesImpl.jar		Xerces 2.3.0
 xmlParserAPIs.jar	Xerces 2.3.0
+concurrent.jar	Build of Doug Lea's concurrent utilities for JDK 1.4.

Copied: labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/ext/concurrent.jar (from rev 12209, labs/jbosstm/trunk/ext/concurrent.jar)
===================================================================
(Binary files differ)