[jboss-cvs] JBossCache/src/org/jboss/cache ...

[Brian Stansberry]

  User: bstansberry
  Date: 06/10/09 18:26:06

  Modified:    src/org/jboss/cache  TreeCache.java
  Log:
  [JBCACHE-798] Use ConcurrentHashMap for lock_table
  
  Revision  Changes    Path
  1.250     +3 -2      JBossCache/src/org/jboss/cache/TreeCache.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCache.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCache.java,v
  retrieving revision 1.249
  retrieving revision 1.250
  diff -u -b -r1.249 -r1.250
  --- TreeCache.java	25 Sep 2006 05:50:04 -0000	1.249
  +++ TreeCache.java	9 Oct 2006 22:26:06 -0000	1.250
  @@ -6,6 +6,7 @@
    */
   package org.jboss.cache;
   
  +import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
   import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  @@ -93,7 +94,7 @@
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    * @author Brian Stansberry
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Id: TreeCache.java,v 1.249 2006/09/25 05:50:04 bwang Exp $
  + * @version $Id: TreeCache.java,v 1.250 2006/10/09 22:26:06 bstansberry Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -155,7 +156,7 @@
      /**
       * HashMap<Thread, List<Lock>, maintains locks acquired by threads (used when no TXs are used)
       */
  -   private final Map lock_table = Collections.synchronizedMap(new HashMap());
  +   private final Map lock_table = new ConcurrentHashMap();
   
      protected boolean usingEviction = false;