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

[Manik Surtani]

  User: msurtani
  Date: 07/01/29 06:46:53

  Modified:    src/org/jboss/cache/interceptors 
                        OptimisticNodeInterceptor.java
  Log:
  removeNode to return bool
  
  Revision  Changes    Path
  1.53      +4 -3      JBossCache/src/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: OptimisticNodeInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -b -r1.52 -r1.53
  --- OptimisticNodeInterceptor.java	19 Jan 2007 14:58:43 -0000	1.52
  +++ OptimisticNodeInterceptor.java	29 Jan 2007 11:46:53 -0000	1.53
  @@ -158,7 +158,7 @@
                  break;
               case MethodDeclarations.removeNodeMethodLocal_id:
                  cache.getNotifier().notifyNodeRemoved(fqn, true, workspaceNode == null ? null : workspaceNode.getData(), false);
  -               removeNode(workspace, workspaceNode);
  +               result = removeNode(workspace, workspaceNode);
                  cache.getNotifier().notifyNodeRemoved(fqn, false, null, false);
                  break;
               case MethodDeclarations.removeKeyMethodLocal_id:
  @@ -321,7 +321,7 @@
         return old;
      }
   
  -   private void removeNode(TransactionWorkspace workspace, WorkspaceNode workspaceNode) throws CacheException
  +   private boolean removeNode(TransactionWorkspace workspace, WorkspaceNode workspaceNode) throws CacheException
      {
         if (log.isTraceEnabled())
         {
  @@ -331,7 +331,7 @@
         // it is already removed - we can ignore it
         if (workspaceNode == null)
         {
  -         return;
  +         return false;
         }
   
         boolean debug = log.isDebugEnabled();
  @@ -365,6 +365,7 @@
               break;// no more children, we came to the end
            }
         }
  +      return true;
      }
   
      private Object removeKey(Object removeKey, TransactionWorkspace workspace, WorkspaceNode workspaceNode)