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

[Manik Surtani]

  User: msurtani
  Date: 06/11/11 13:01:03

  Modified:    src/org/jboss/cache/interceptors  Tag:
                        Branch_JBossCache_1_4_0
                        OptimisticValidatorInterceptor.java
  Log:
  JBCACHE-842
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.25.2.4  +1 -1      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.2.3
  retrieving revision 1.25.2.4
  diff -u -b -r1.25.2.3 -r1.25.2.4
  --- OptimisticValidatorInterceptor.java	11 Nov 2006 17:50:03 -0000	1.25.2.3
  +++ OptimisticValidatorInterceptor.java	11 Nov 2006 18:01:03 -0000	1.25.2.4
  @@ -138,7 +138,7 @@
                  {
                     throw new DataVersioningException("Attempting to apply data version of type " + workspaceNode.getVersion().getClass() + " to a node that already contains version of type " + realNode.getVersion().getClass());                  
                  }
  -               if (realNode.getVersion().newerThan( workspaceNode.getVersion() ))
  +               if (workspaceNode.isDirty() && realNode.getVersion().newerThan( workspaceNode.getVersion() ))
                  {
                      // we have an out of date node here
                     throw new DataVersioningException("DataNode [" + fqn + "] version " + ((OptimisticTreeNode)workspaceNode.getNode()).getVersion() + " is newer than workspace node " + workspaceNode.getVersion());