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

[Manik Surtani]

  User: msurtani
  Date: 06/08/08 08:21:22

  Modified:    src/org/jboss/cache/interceptors  Tag:
                        Branch_JBossCache_1_4_0
                        OptimisticValidatorInterceptor.java
  Log:
  JBCACHE-729
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.25.2.1  +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.25
  retrieving revision 1.25.2.1
  diff -u -b -r1.25 -r1.25.2.1
  --- OptimisticValidatorInterceptor.java	6 Jun 2006 10:17:14 -0000	1.25
  +++ OptimisticValidatorInterceptor.java	8 Aug 2006 12:21:22 -0000	1.25.2.1
  @@ -155,8 +155,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();
  +                cache.notifyNodeRemove(dNode.getFqn(), true);
  +
                   if (dNode.getFqn().isRoot())
                   {
                       log.warn("Attempted to delete the root node");
  @@ -166,6 +170,8 @@
                       DataNode parent = (DataNode) dNode.getParent();
                       parent.removeChild( dNode.getName() );
                   }
  +                cache.notifyNodeRemoved(dNode.getFqn());
  +                cache.notifyNodeRemove(dNode.getFqn(), false);
               }
               else
               {
  @@ -173,6 +179,7 @@
                   // if (wrappedNode.hasCreatedOrRemovedChildren() handleChildNodes(wrappedNode);
                   if (wrappedNode.isDirty())
                   {
  +                    cache.notifyNodeModify(wrappedNode.getFqn(), true);
                       OptimisticTreeNode current = (OptimisticTreeNode) wrappedNode.getNode();
                       Map mergedChildren = wrappedNode.getMergedChildren();
   
  @@ -192,10 +199,13 @@
                           current.setVersion(wrappedNode.getVersion());
                       }
                       if (trace) log.trace("Setting version of node " + current.getName() + " from " + wrappedNode.getVersion() + " to " + current.getVersion());
  +                    cache.notifyNodeModified(wrappedNode.getFqn());
  +                    cache.notifyNodeModify(wrappedNode.getFqn(), false);
                   }
                   else
                   {
                       if (trace) log.trace("Merging node " + wrappedNode.getFqn() + " not necessary since the node is not dirty");
  +                    cache.notifyNodeVisited(wrappedNode.getFqn());
                   }
               }
           }