Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8947B4A6C for ; Tue, 5 Jul 2011 12:54:33 +0000 (UTC) Received: (qmail 70148 invoked by uid 500); 5 Jul 2011 12:54:33 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 70080 invoked by uid 500); 5 Jul 2011 12:54:32 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 70073 invoked by uid 99); 5 Jul 2011 12:54:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jul 2011 12:54:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jul 2011 12:54:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0E15D23889B1; Tue, 5 Jul 2011 12:54:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1143034 - /sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java Date: Tue, 05 Jul 2011 12:54:08 -0000 To: commits@sling.apache.org From: fmeschbe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110705125408.0E15D23889B1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fmeschbe Date: Tue Jul 5 12:54:07 2011 New Revision: 1143034 URL: http://svn.apache.org/viewvc?rev=1143034&view=rev Log: SLING-2123 Use Map instead of Map 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=1143034&r1=1143033&r2=1143034&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 Tue Jul 5 12:54:07 2011 @@ -355,7 +355,7 @@ public class Loader extends BaseImportLo // init content creator contentCreator.init(configuration, this.defaultImportProviders, createdNodes, null); - final Map processedEntries = new HashMap(); + final Map processedEntries = new HashMap(); @SuppressWarnings("unchecked") Enumeration entries = bundle.getEntryPaths(path); @@ -379,7 +379,7 @@ public class Loader extends BaseImportLo // potential parent node import/extension URL parentNodeDescriptor = importParentNode(parent.getSession(), bundle, path, parent, contentCreator); if (parentNodeDescriptor != null) { - processedEntries.put(parentNodeDescriptor, parent); + processedEntries.put(parentNodeDescriptor.toString(), parent); } while (entries.hasMoreElements()) { @@ -408,7 +408,7 @@ public class Loader extends BaseImportLo if (node == null) { node = createNode(parent, name, nodeDescriptor, configuration, contentCreator); - processedEntries.put(nodeDescriptor, node); + processedEntries.put(nodeDescriptor.toString(), node); } } else { node = createFolder(parent, name, configuration.isOverwrite()); @@ -439,7 +439,7 @@ public class Loader extends BaseImportLo */ private void handleFile(final String entry, final Bundle bundle, - final Map processedEntries, + final Map processedEntries, final PathEntry configuration, final Node parent, final List createdNodes, @@ -469,7 +469,7 @@ public class Loader extends BaseImportLo if (foundProvider) { if ((node = createNode(parent, name, file, configuration, contentCreator)) != null) { log.debug("Created Node as {} {} ",node.getPath(),name); - processedEntries.put(file, node); + processedEntries.put(file.toString(), node); } else { log.warn("No Node created for file {} {} ",file,name); } @@ -493,7 +493,7 @@ public class Loader extends BaseImportLo contentCreator.setIgnoreOverwriteFlag(true); node = createNode(parent, name, nodeDescriptor, configuration, contentCreator); - processedEntries.put(nodeDescriptor, node); + processedEntries.put(nodeDescriptor.toString(), node); } finally { contentCreator.setIgnoreOverwriteFlag(false); }