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

[Manik Surtani]

  User: msurtani
  Date: 07/01/02 09:37:14

  Modified:    src/org/jboss/cache/interceptors  
                        OptimisticNodeInterceptor.java
                        OptimisticCreateIfNotExistsInterceptor.java
  Log:
  Move() related bugs
  
  Revision  Changes    Path
  1.41      +1 -1      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.40
  retrieving revision 1.41
  diff -u -b -r1.40 -r1.41
  --- OptimisticNodeInterceptor.java	31 Dec 2006 03:01:20 -0000	1.40
  +++ OptimisticNodeInterceptor.java	2 Jan 2007 14:37:14 -0000	1.41
  @@ -47,7 +47,7 @@
   
         if (MethodDeclarations.moveMethodLocal_id == m.getMethodId())
         {
  -         if (ctx.getOptionOverrides().getDataVersion() != null)
  +         if (ctx.getOptionOverrides().getDataVersion() != null && ctx.isOriginLocal())
            {
               throw new CacheException("Setting a data version while performing a move() is not supported!!");
            }
  
  
  
  1.35      +1 -1      JBossCache/src/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: OptimisticCreateIfNotExistsInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -b -r1.34 -r1.35
  --- OptimisticCreateIfNotExistsInterceptor.java	31 Dec 2006 03:01:20 -0000	1.34
  +++ OptimisticCreateIfNotExistsInterceptor.java	2 Jan 2007 14:37:14 -0000	1.35
  @@ -60,7 +60,7 @@
         fqns.add(newParent);
   
         //  peek into Node and get a hold of all child fqns as these need to be in the workspace.
  -      Node node = cache.getRoot().getChild(nodeFqn);
  +      Node node = cache.peek(nodeFqn);
         greedyGetFqns(fqns, node, newParent);