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

[Manik Surtani]

  User: msurtani
  Date: 07/03/08 11:12:49

  Modified:    src/org/jboss/cache/optimistic   WorkspaceNode.java
                        WorkspaceNodeImpl.java
  Log:
  Some JBCACHE-961 related fixes
  
  Revision  Changes    Path
  1.25      +1 -1      JBossCache/src/org/jboss/cache/optimistic/WorkspaceNode.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WorkspaceNode.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/optimistic/WorkspaceNode.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -b -r1.24 -r1.25
  --- WorkspaceNode.java	7 Mar 2007 18:00:57 -0000	1.24
  +++ WorkspaceNode.java	8 Mar 2007 16:12:49 -0000	1.25
  @@ -32,7 +32,7 @@
       *
       * @return a merged map of child names and Nodes
       */
  -   List<Set<NodeSPI>> getMergedChildren();
  +   List<Set<Fqn>> getMergedChildren();
   
      /**
       * Retrieves the data version of the in-memory node.
  
  
  
  1.53      +11 -10    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.52
  retrieving revision 1.53
  diff -u -b -r1.52 -r1.53
  --- WorkspaceNodeImpl.java	8 Mar 2007 12:58:15 -0000	1.52
  +++ WorkspaceNodeImpl.java	8 Mar 2007 16:12:49 -0000	1.53
  @@ -42,8 +42,8 @@
      private boolean created;
      private boolean childrenModified;
      private Map<Object, NodeSPI> optimisticChildNodeMap;
  -   private Set<NodeSPI> childrenAdded = new HashSet<NodeSPI>();
  -   private Set<NodeSPI> childrenRemoved = new HashSet<NodeSPI>();
  +   private Set<Fqn> childrenAdded = new HashSet<Fqn>();
  +   private Set<Fqn> childrenRemoved = new HashSet<Fqn>();
      private Map<Object, Object> optimisticDataMap;
      private boolean versioningImplicit = true; // default
   
  @@ -161,8 +161,8 @@
         {
            child = (NodeSPI) cache.getConfiguration().getRuntimeConfig().getNodeFactory().createNodeOfType(parent, child_name, parent, null);
            optimisticChildNodeMap.put(child_name, child);
  -         childrenAdded.add(child);
  -         childrenRemoved.remove(child);
  +         childrenAdded.add(child.getFqn());
  +         childrenRemoved.remove(child.getFqn());
         }
         childrenModified = true;
         return child;
  @@ -199,10 +199,10 @@
         this.version = version;
      }
   
  -   public List<Set<NodeSPI>> getMergedChildren()
  +   public List<Set<Fqn>> getMergedChildren()
      {
         //return optimisticChildNodeMap;
  -      List<Set<NodeSPI>> l = new ArrayList<Set<NodeSPI>>(2);
  +      List<Set<Fqn>> l = new ArrayList<Set<Fqn>>(2);
         l.add(childrenAdded);
         l.add(childrenRemoved);
         return l;
  @@ -283,8 +283,9 @@
      public void addChild(WorkspaceNode child)
      {
         optimisticChildNodeMap.put(child.getFqn().getLastElement(), child.getNode());
  -      childrenAdded.add(child.getNode());
  -      childrenRemoved.remove(child.getNode());
  +      childrenAdded.add(child.getFqn());
  +      childrenRemoved.remove(child.getFqn());
  +      if (log.isTraceEnabled()) log.trace("Adding child " + child.getFqn());
      }
   
      public void clearData()
  @@ -347,10 +348,10 @@
      public boolean removeChild(Object childName)
      {
         NodeSPI n = optimisticChildNodeMap.remove(childName);
  -      childrenRemoved.add(n);
  -      childrenAdded.remove(n);
         if (n != null)
         {
  +         childrenRemoved.add(n.getFqn());
  +         childrenAdded.remove(n.getFqn());
            childrenModified = true;
            return true;
         }