Author: tolusha
Date: 2010-10-01 05:05:08 -0400 (Fri, 01 Oct 2010)
New Revision: 3229
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java
Log:
EXOJCR-961: remain node only for versionable node and OnParentVersionAction is VERSION for
other cases all works accordingly to spec
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java 2010-10-01
07:20:11 UTC (rev 3228)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java 2010-10-01
09:05:08 UTC (rev 3229)
@@ -199,11 +199,7 @@
nodeTypeDataManager.getChildNodeDefinition(node.getQPath().getName(),
parent.getPrimaryTypeName(),
parent.getMixinTypeNames()).getOnParentVersion();
- // ItemDataCopyIgnoredVisitory
- if (onParentVersion != OnParentVersionAction.COPY
- && onParentVersion != OnParentVersionAction.VERSION
- && onParentVersion != OnParentVersionAction.IGNORE
- || onParentVersion == OnParentVersionAction.VERSION
+ if (onParentVersion == OnParentVersionAction.VERSION
&& nodeTypeDataManager.isNodeType(Constants.MIX_VERSIONABLE,
node.getPrimaryTypeName(),
node.getMixinTypeNames()))
{
Show replies by date