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

[Manik Surtani]

  User: msurtani
  Date: 06/08/09 10:50:00

  Modified:    src/org/jboss/cache/optimistic  WorkspaceNodeImpl.java
  Log:
  Merged in fixes from 1.4.0.SP1
  
  Revision  Changes    Path
  1.22      +17 -7     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.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- WorkspaceNodeImpl.java	10 Apr 2006 00:36:53 -0000	1.21
  +++ WorkspaceNodeImpl.java	9 Aug 2006 14:50:00 -0000	1.22
  @@ -6,15 +6,25 @@
    */
   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.Collections;
  +import java.util.HashMap;
  +import java.util.HashSet;
  +import java.util.Map;
  +import java.util.Set;
   
   /**
    * Wraps a DataNode and adds versioning and other meta data to it.
  @@ -67,7 +77,7 @@
           }
           else
           {
  -            optimisticChildNodeMap = new HashMap(node.getChildren());
  +            optimisticChildNodeMap = new ConcurrentReaderHashMap(node.getChildren());
           }
           this.version = ((OptimisticTreeNode) node).getVersion();
       }
  @@ -197,7 +207,7 @@
           {
               child = NodeFactory.getInstance().createNodeOfType(parent, child_name, fqn, parent, null, cache, version);
               if (optimisticChildNodeMap == Collections.EMPTY_MAP)
  -                optimisticChildNodeMap = new HashMap();
  +                optimisticChildNodeMap = new ConcurrentReaderHashMap();
               optimisticChildNodeMap.put(child_name, child);
           }
           if (log.isTraceEnabled())