jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1478718 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java
Date Fri, 03 May 2013 10:37:22 GMT
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;
             }
         }



Mime
View raw message