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

[Brian Stansberry]

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

  Modified:    src/org/jboss/cache  Tag: Branch_JBossCache_1_4_0
                        TreeCache.java
  Log:
  [JBCACHE-798] Use ConcurrentHashMap for lock_table
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.195.2.11 +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.195.2.10
  retrieving revision 1.195.2.11
  diff -u -b -r1.195.2.10 -r1.195.2.11
  --- TreeCache.java	26 Sep 2006 10:21:46 -0000	1.195.2.10
  +++ TreeCache.java	9 Oct 2006 22:25:06 -0000	1.195.2.11
  @@ -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;
  @@ -79,7 +80,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.195.2.10 2006/09/26 10:21:46 gzamarreno Exp $
  + * @version $Id: TreeCache.java,v 1.195.2.11 2006/10/09 22:25:06 bstansberry Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -207,7 +208,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 fetchInMemoryState = true;