Author: jiwils Date: 2009-06-16 18:24:06 -0400 (Tue, 16 Jun 2009) New Revision: 8107 Modified: core/support-branches/1.4.1.SP11_JBCACHE-1304/src/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java Log: Merged the fix from 1.4.x for JBCACHE-1304. Modified: core/support-branches/1.4.1.SP11_JBCACHE-1304/src/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java =================================================================== --- core/support-branches/1.4.1.SP11_JBCACHE-1304/src/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java 2009-06-16 15:59:54 UTC (rev 8106) +++ core/support-branches/1.4.1.SP11_JBCACHE-1304/src/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java 2009-06-16 22:24:06 UTC (rev 8107) @@ -3,11 +3,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; + import javax.transaction.RollbackException; import javax.transaction.Synchronization; import javax.transaction.SystemException; import javax.transaction.Transaction; -import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; import java.util.Map; @@ -27,7 +28,7 @@ LinkedList handlers=new LinkedList(); /** Map<Transaction,OrderedSynchronizationHandler> */ - static Map instances=new HashMap(); + static Map instances=new ConcurrentHashMap(); static Log log=LogFactory.getLog(OrderedSynchronizationHandler.class);