Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 91242 invoked from network); 2 Jul 2010 22:25:51 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Jul 2010 22:25:51 -0000 Received: (qmail 37328 invoked by uid 500); 2 Jul 2010 22:25:51 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 37259 invoked by uid 500); 2 Jul 2010 22:25:50 -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 37251 invoked by uid 99); 2 Jul 2010 22:25:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Jul 2010 22:25:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 02 Jul 2010 22:25:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7FDE923889E5; Fri, 2 Jul 2010 22:24:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r960126 - /sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java Date: Fri, 02 Jul 2010 22:24:24 -0000 To: commits@sling.apache.org From: ieb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100702222424.7FDE923889E5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ieb Date: Fri Jul 2 22:24:24 2010 New Revision: 960126 URL: http://svn.apache.org/viewvc?rev=960126&view=rev Log: SLING-1582 added better information at debug level. 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=960126&r1=960125&r2=960126&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 Fri Jul 2 22:24:24 2010 @@ -440,51 +440,60 @@ public class Loader extends BaseImportLo throws RepositoryException { final URL file = bundle.getEntry(entry); final String name = getName(entry); - - if (processedEntries.containsKey(file)) { - // this is a consumed node descriptor - return; - } - - // check for node descriptor - URL nodeDescriptor = null; - for (String ext : this.contentCreator.getImportProviders().keySet()) { - nodeDescriptor = bundle.getEntry(entry + ext); - if (nodeDescriptor != null) { - break; + try { + if (processedEntries.containsKey(file)) { + // this is a consumed node descriptor + return; + } + + // check for node descriptor + URL nodeDescriptor = null; + for (String ext : this.contentCreator.getImportProviders().keySet()) { + nodeDescriptor = bundle.getEntry(entry + ext); + if (nodeDescriptor != null) { + break; + } } - } - - // install if it is a descriptor - boolean foundProvider = this.contentCreator.getImportProvider(entry) != null; - - Node node = null; - if (foundProvider) { - if ((node = createNode(parent, name, file, configuration)) != null) { - processedEntries.put(file, node); + + // install if it is a descriptor + boolean foundProvider = this.contentCreator.getImportProvider(entry) != null; + + Node node = null; + if (foundProvider) { + if ((node = createNode(parent, name, file, configuration)) != null) { + log.debug("Created Node as {} {} ",node.getPath(),name); + processedEntries.put(file, node); + } else { + log.warn("No Node created for file {} {} ",file,name); + } + } else { + log.debug("Cant find provider for Entry {} at {} ",entry,name); } - } - - // otherwise just place as file - if ( node == null ) { - try { - createFile(configuration, parent, file, createdNodes); - node = parent.getNode(name); - } catch (IOException ioe) { - log.warn("Cannot create file node for {}", file, ioe); + + // otherwise just place as file + if ( node == null ) { + try { + createFile(configuration, parent, file, createdNodes); + node = parent.getNode(name); + } catch (IOException ioe) { + log.warn("Cannot create file node for {}", file, ioe); + } } - } - // if we have a descriptor, which has not been processed yet, - // process it - if (nodeDescriptor != null && processedEntries.get(nodeDescriptor) == null ) { - try { - this.contentCreator.setIgnoreOverwriteFlag(true); - node = createNode(parent, name, nodeDescriptor, - configuration); - processedEntries.put(nodeDescriptor, node); - } finally { - this.contentCreator.setIgnoreOverwriteFlag(false); + // if we have a descriptor, which has not been processed yet, + // process it + if (nodeDescriptor != null && processedEntries.get(nodeDescriptor) == null ) { + try { + this.contentCreator.setIgnoreOverwriteFlag(true); + node = createNode(parent, name, nodeDescriptor, + configuration); + processedEntries.put(nodeDescriptor, node); + } finally { + this.contentCreator.setIgnoreOverwriteFlag(false); + } } + } catch ( RepositoryException e ) { + log.error("Failed to process process file {} from {}", file, name); + throw e; } }