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

[Manik Surtani]

  User: msurtani
  Date: 06/11/13 08:00:05

  Modified:    src/org/jboss/cache/optimistic  Tag: Branch_JBossCache_1_4_0
                        WorkspaceNodeImpl.java
  Log:
  Fixed test failures
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.21.2.2  +15 -8     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.2.1
  retrieving revision 1.21.2.2
  diff -u -b -r1.21.2.1 -r1.21.2.2
  --- WorkspaceNodeImpl.java	9 Aug 2006 12:30:12 -0000	1.21.2.1
  +++ WorkspaceNodeImpl.java	13 Nov 2006 13:00:04 -0000	1.21.2.2
  @@ -6,18 +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 EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
  -import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
  +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.
  @@ -148,7 +155,7 @@
           {
               optimisticDataMap.clear();
           }
  -        optimisticDataMap.putAll(data);
  +       if (data != null) optimisticDataMap.putAll(data);
       }
   
       public void removeChild(Object childName)