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

[Manik Surtani]

  User: msurtani
  Date: 06/07/12 11:41:28

  Modified:    src/org/jboss/cache/optimistic  Tag: Branch_JBossCache_1_3_0
                        WorkspaceNodeImpl.java
  Log:
  fixed JBCACHE-665
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.19.2.1  +17 -6     JBossCache/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WorkspaceNodeImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java,v
  retrieving revision 1.19
  retrieving revision 1.19.2.1
  diff -u -b -r1.19 -r1.19.2.1
  --- WorkspaceNodeImpl.java	21 Feb 2006 22:51:10 -0000	1.19
  +++ WorkspaceNodeImpl.java	12 Jul 2006 15:41:28 -0000	1.19.2.1
  @@ -6,15 +6,24 @@
    */
   package org.jboss.cache.optimistic;
   
  -import org.jboss.cache.*;
  +import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
  +import org.jboss.cache.DataNode;
  +import org.jboss.cache.Fqn;
  +import org.jboss.cache.GlobalTransaction;
  +import org.jboss.cache.OptimisticTreeNode;
  +import org.jboss.cache.TreeCache;
  +import org.jboss.cache.TreeNode;
   import org.jboss.cache.factories.NodeFactory;
   import org.jboss.cache.lock.IdentityLock;
   import org.jboss.cache.lock.LockingException;
   import org.jboss.cache.lock.TimeoutException;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
   
  -import java.util.*;
  +import java.util.HashMap;
  +import java.util.HashSet;
  +import java.util.Map;
  +import java.util.Set;
   
   /**
    * TODO: MANIK: Add proper javadocs
  @@ -60,12 +69,14 @@
           {
               // why is this lazy?
   //            optimisticChildNodeMap = new OptimisticMap();
  -            optimisticChildNodeMap = new HashMap();
  +            optimisticChildNodeMap = new ConcurrentReaderHashMap();
  +            //optimisticChildNodeMap = new HashMap();
           }
           else
           {
   //            optimisticChildNodeMap = new OptimisticMap(new HashMap(node.getChildren()));
  -            optimisticChildNodeMap = new HashMap( node.getChildren() );
  +            optimisticChildNodeMap = new ConcurrentReaderHashMap(node.getChildren());
  +            //optimisticChildNodeMap = new HashMap( node.getChildren() );
           }
           this.version = ((OptimisticTreeNode) node).getVersion();
           fqn = node.getFqn();