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

[Manik Surtani]

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

  Modified:    src/org/jboss/cache/interceptors 
                        OptimisticValidatorInterceptor.java
  Log:
  Merged in fixes from 1.4.0.SP1
  
  Revision  Changes    Path
  1.27      +10 -0     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.26
  retrieving revision 1.27
  diff -u -b -r1.26 -r1.27
  --- OptimisticValidatorInterceptor.java	19 Jul 2006 21:34:43 -0000	1.26
  +++ OptimisticValidatorInterceptor.java	9 Aug 2006 14:50:00 -0000	1.27
  @@ -149,8 +149,12 @@
               // short circuit if this node is deleted?
               if (wrappedNode.isDeleted())
               {
  +                // handle notifications
  +
                   if (trace) log.trace("Workspace node " + wrappedNode.getFqn() + " deleted; removing");
                   DataNode dNode = wrappedNode.getNode();
  +                // TODO : MANIK: cache.notifyNodeRemoved(dNode.getFqn(), true);
  +
                   if (dNode.getFqn().isRoot())
                   {
                       log.warn("Attempted to delete the root node");
  @@ -160,6 +164,8 @@
                       DataNode parent = (DataNode) dNode.getParent();
                       parent.removeChild( dNode.getName() );
                   }
  +                // TODO : MANIK: cache.notifyNodeRemoved(dNode.getFqn());
  +                // TODO : MANIK: cache.notifyNodeRemove(dNode.getFqn(), false);
               }
               else
               {
  @@ -167,6 +173,7 @@
                   // if (wrappedNode.hasCreatedOrRemovedChildren() handleChildNodes(wrappedNode);
                   if (wrappedNode.isDirty())
                   {
  +                    // TODO : MANIK: cache.notifyNodeModify(wrappedNode.getFqn(), true);
                       OptimisticTreeNode current = (OptimisticTreeNode) wrappedNode.getNode();
                       Map mergedChildren = wrappedNode.getMergedChildren();
   
  @@ -186,10 +193,13 @@
                           current.setVersion(wrappedNode.getVersion());
                       }
                       if (trace) log.trace("Setting version of node " + current.getName() + " from " + wrappedNode.getVersion() + " to " + current.getVersion());
  +                    // TODO : MANIK: cache.notifyNodeModified(wrappedNode.getFqn());
  +                    // TODO : MANIK: cache.notifyNodeModify(wrappedNode.getFqn(), false);
                   }
                   else
                   {
                       if (trace) log.trace("Merging node " + wrappedNode.getFqn() + " not necessary since the node is not dirty");
  +                    // TODO : MANIK: cache.notifyNodeVisited(wrappedNode.getFqn());
                   }
               }
           }