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

[Manik Surtani]

  User: msurtani
  Date: 07/02/22 02:01:32

  Modified:    src/org/jboss/cache/optimistic  WorkspaceNodeImpl.java
  Log:
  - Better cleanup after test
  - fixed NPE with ConcurrentHashMap construction
  
  Revision  Changes    Path
  1.49      +1 -1      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.48
  retrieving revision 1.49
  diff -u -b -r1.48 -r1.49
  --- WorkspaceNodeImpl.java	7 Feb 2007 22:06:57 -0000	1.48
  +++ WorkspaceNodeImpl.java	22 Feb 2007 07:01:32 -0000	1.49
  @@ -56,7 +56,7 @@
         this.workspace = workspace;
         optimisticDataMap = new HashMap<Object, Object>(node.getDataDirect());
         Map<Object, Node> childrenMap = node.getChildrenMapDirect();
  -      this.optimisticChildNodeMap = new ConcurrentHashMap(childrenMap);
  +      this.optimisticChildNodeMap = childrenMap == null ? new ConcurrentHashMap() : new ConcurrentHashMap(childrenMap);
         this.version = node.getVersion();
         if (version == null)
         {