[jboss-cvs] JBossCache/src/org/jboss/cache/interceptors ...
Manik Surtani
msurtani at jboss.com
Sat Nov 11 13:53:51 EST 2006
User: msurtani
Date: 06/11/11 13:53:51
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.5 +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.4
retrieving revision 1.25.2.5
diff -u -b -r1.25.2.4 -r1.25.2.5
--- OptimisticValidatorInterceptor.java 11 Nov 2006 18:01:03 -0000 1.25.2.4
+++ OptimisticValidatorInterceptor.java 11 Nov 2006 18:53:51 -0000 1.25.2.5
@@ -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 (workspaceNode.isDirty() && realNode.getVersion().newerThan( workspaceNode.getVersion() ))
+ if ((workspaceNode.isDeleted() || 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());
More information about the jboss-cvs-commits
mailing list