You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2017/05/03 15:56:59 UTC
svn commit: r1793667 -
/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/BundleContentLoader.java
Author: sseifert
Date: Wed May 3 15:56:59 2017
New Revision: 1793667
URL: http://svn.apache.org/viewvc?rev=1793667&view=rev
Log:
SLING-6825 make sure node descriptors for files are not ignored
Modified:
sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/BundleContentLoader.java
Modified: sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/BundleContentLoader.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/BundleContentLoader.java?rev=1793667&r1=1793666&r2=1793667&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/BundleContentLoader.java (original)
+++ sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/BundleContentLoader.java Wed May 3 15:56:59 2017
@@ -432,7 +432,7 @@ public class BundleContentLoader extends
}
// if we have a descriptor, which has not been processed yet,
// process it
- if (nodeDescriptor != null && processedEntries.containsKey(nodeDescriptor.toString())) {
+ if (nodeDescriptor != null && !processedEntries.containsKey(nodeDescriptor.toString())) {
try {
contentCreator.setIgnoreOverwriteFlag(true);
node = createNode(parent, name, nodeDescriptor, contentCreator, configuration);