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

[Manik Surtani]

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

  Modified:    src/org/jboss/cache/interceptors 
                        OptimisticValidatorInterceptor.java
  Log:
  Some JBCACHE-961 related fixes
  
  Revision  Changes    Path
  1.59      +5 -5      JBossCache/src/org/jboss/cache/interceptors/OptimisticValidatorInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: OptimisticValidatorInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/OptimisticValidatorInterceptor.java,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -b -r1.58 -r1.59
  --- OptimisticValidatorInterceptor.java	7 Mar 2007 18:01:04 -0000	1.58
  +++ OptimisticValidatorInterceptor.java	8 Mar 2007 16:12:49 -0000	1.59
  @@ -189,17 +189,17 @@
               {
                  log.trace("Updating children since node has modified children");
                  // merge children.
  -               List<Set<NodeSPI>> deltas = wrappedNode.getMergedChildren();
  +               List<Set<Fqn>> deltas = wrappedNode.getMergedChildren();
   
                  if (trace) log.trace("Applying children deltas to parent node " + current.getFqn());
  -               for (NodeSPI child : deltas.get(0))
  +               for (Fqn child : deltas.get(0))
                  {
  -                  current.addChildDirect(child);
  +                  current.addChildDirect(wrappedNode.getChild(child.getLastElement()));
                  }
   
  -               for (NodeSPI child : deltas.get(1))
  +               for (Fqn child : deltas.get(1))
                  {
  -                  current.removeChildDirect(child.getFqn());
  +                  current.removeChildDirect(child.getLastElement());
                  }
   
                  updateVersion = cache.getConfiguration().isLockParentForChildInsertRemove();