You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2013/05/03 12:37:22 UTC
svn commit: r1478718 -
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java
Author: jukka
Date: Fri May 3 10:37:22 2013
New Revision: 1478718
URL: http://svn.apache.org/r1478718
Log:
JCR-3585: Merge/update does not skip simpleVersionable content
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java?rev=1478718&r1=1478717&r2=1478718&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java Fri May 3 10:37:22 2013
@@ -92,7 +92,8 @@ abstract public class VersionManagerImpl
if (shallow) {
// If <code>isShallow</code> is <code>true</code> and this node is not
// versionable, then this method returns and no changes are made.
- if (!state.getEffectiveNodeType().includesNodeType(NameConstants.MIX_VERSIONABLE)) {
+ if (!state.getEffectiveNodeType().includesNodeType(
+ NameConstants.MIX_SIMPLE_VERSIONABLE)) {
return;
}
}