[jboss-svn-commits] JBL Code SVN: r12136 - labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore.

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

Author: mark.little at jboss.com
Date: 2007-05-25 06:43:33 -0400 (Fri, 25 May 2007)
New Revision: 12136

Modified:
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java
Log:
added catch for ABORTING.

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java	2007-05-25 10:35:17 UTC (rev 12135)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java	2007-05-25 10:43:33 UTC (rev 12136)
@@ -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.
@@ -1247,6 +1249,7 @@
     			case ActionStatus.ABORT_ONLY:
     				break;
                 case ActionStatus.ABORTED:
+                case ActionStatus.ABORTING:
                     _theTransaction.abort() ;
     			default:
     				throw new IllegalStateException(
@@ -1264,6 +1267,7 @@
 					throw new javax.transaction.HeuristicMixedException();
 				case ActionStatus.H_ROLLBACK:
 				case ActionStatus.ABORTED:
+				case ActionStatus.ABORTING:
 					RollbackException rollbackException = new RollbackException(jtaLogger.logMesg.getString("com.arjuna.ats.internal.jta.transaction.arjunacore.commitwhenaborted"));
 					if(_theTransaction.getDeferredThrowable() != null) {
 						rollbackException.initCause(_theTransaction.getDeferredThrowable());
@@ -1699,6 +1703,10 @@
                 }
 	}
 
-	private static Hashtable _transactions = new Hashtable();
+    //	private static Hashtable _transactions = new Hashtable();
 
+    //    private static ConcurrentHashMap _transactions = new ConcurrentHashMap();
+
+        private static java.util.Map _transactions = java.util.Collections.synchronizedMap(new java.util.HashMap());
+
 }