incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o...@apache.org
Subject svn commit: r1528790 - /sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java
Date Thu, 03 Oct 2013 10:33:15 GMT
Author: olli
Date: Thu Oct  3 10:33:15 2013
New Revision: 1528790

URL: http://svn.apache.org/r1528790
Log:
SLING-2917 fix read/write access on processed entries

Modified:
    sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java

Modified: sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java?rev=1528790&r1=1528789&r2=1528790&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java
(original)
+++ sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java
Thu Oct  3 10:33:15 2013
@@ -356,7 +356,7 @@ public class Loader extends BaseImportLo
                 final String name = getName(base);
                 Node node = null;
                 if (nodeDescriptor != null) {
-                    node = processedEntries.get(nodeDescriptor);
+                    node = processedEntries.get(nodeDescriptor.toString());
                     if (node == null) {
                         node = createNode(parent, name, nodeDescriptor, contentCreator);
                         processedEntries.put(nodeDescriptor.toString(), node);
@@ -393,7 +393,7 @@ public class Loader extends BaseImportLo
         final URL file = bundle.getEntry(entry);
         final String name = getName(entry);
         try {
-            if (processedEntries.containsKey(file)) {
+            if (processedEntries.containsKey(file.toString())) {
                 // this is a consumed node descriptor
                 return;
             }
@@ -434,7 +434,7 @@ public class Loader extends BaseImportLo
             }
             // if we have a descriptor, which has not been processed yet,
             // process it
-            if (nodeDescriptor != null && processedEntries.get(nodeDescriptor) ==
null) {
+            if (nodeDescriptor != null && processedEntries.containsKey(nodeDescriptor.toString()))
{
                 try {
                     contentCreator.setIgnoreOverwriteFlag(true);
                     node = createNode(parent, name, nodeDescriptor, contentCreator);



Mime
View raw message