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

[Manik Surtani]

  User: msurtani
  Date: 07/01/18 11:42:15

  Modified:    src/org/jboss/cache/interceptors  
                        OptimisticCreateIfNotExistsInterceptor.java
                        OptimisticNodeInterceptor.java
  Log:
  JBCACHE-940
  
  Revision  Changes    Path
  1.43      +3 -0      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.42
  retrieving revision 1.43
  diff -u -b -r1.42 -r1.43
  --- OptimisticCreateIfNotExistsInterceptor.java	17 Jan 2007 16:24:06 -0000	1.42
  +++ OptimisticCreateIfNotExistsInterceptor.java	18 Jan 2007 16:42:15 -0000	1.43
  @@ -19,6 +19,7 @@
   import org.jboss.cache.marshall.MethodDeclarations;
   import org.jboss.cache.notifications.Notifier;
   import org.jboss.cache.optimistic.DataVersion;
  +import org.jboss.cache.optimistic.DefaultDataVersion;
   import org.jboss.cache.optimistic.TransactionWorkspace;
   import org.jboss.cache.optimistic.WorkspaceNode;
   
  @@ -178,6 +179,8 @@
                        log.debug("Parent node doesn't exist in workspace or has been deleted.  Adding to workspace.");
                     }
                     workspace.addNode(workspaceNode);
  +                  if (!(workspaceNode.getVersion() instanceof DefaultDataVersion))
  +                     workspaceNode.setVersioningImplicit(false);
                  }
                  else
                  {
  
  
  
  1.50      +4 -0      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.49
  retrieving revision 1.50
  diff -u -b -r1.49 -r1.50
  --- OptimisticNodeInterceptor.java	17 Jan 2007 16:24:06 -0000	1.49
  +++ OptimisticNodeInterceptor.java	18 Jan 2007 16:42:15 -0000	1.50
  @@ -19,6 +19,7 @@
   import org.jboss.cache.marshall.MethodCall;
   import org.jboss.cache.marshall.MethodDeclarations;
   import org.jboss.cache.optimistic.DataVersion;
  +import org.jboss.cache.optimistic.DefaultDataVersion;
   import org.jboss.cache.optimistic.TransactionWorkspace;
   import org.jboss.cache.optimistic.WorkspaceNode;
   
  @@ -502,6 +503,9 @@
               workspaceNode = null;
            }
         }
  +
  +      if (workspaceNode != null && !(workspaceNode.getVersion() instanceof DefaultDataVersion))
  +         workspaceNode.setVersioningImplicit(false);
         return workspaceNode;
      }
   }