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 1378B10147 for ; Thu, 3 Oct 2013 09:42:57 +0000 (UTC) Received: (qmail 47176 invoked by uid 500); 3 Oct 2013 09:42:51 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 46996 invoked by uid 500); 3 Oct 2013 09:42:47 -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 46973 invoked by uid 99); 3 Oct 2013 09:42:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Oct 2013 09:42:44 +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; Thu, 03 Oct 2013 09:42:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4163B238883D; Thu, 3 Oct 2013 09:42:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1528769 - /sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java Date: Thu, 03 Oct 2013 09:42:22 -0000 To: commits@sling.apache.org From: olli@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131003094222.4163B238883D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olli Date: Thu Oct 3 09:42:21 2013 New Revision: 1528769 URL: http://svn.apache.org/r1528769 Log: SLING-2917 style 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=1528769&r1=1528768&r2=1528769&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 09:42:21 2013 @@ -412,14 +412,15 @@ public class Loader extends BaseImportLo Node node = null; if (foundProvider) { - if ((node = createNode(parent, name, file, configuration, contentCreator)) != null) { - log.debug("Created node as {} {} ", node.getPath(), name); + node = createNode(parent, name, file, configuration, contentCreator); + if (node != null) { + log.debug("Created node as {} {}", node.getPath(), name); processedEntries.put(file.toString(), node); } else { - log.warn("No node created for file {} {} ", file, name); + log.warn("No node created for file {} {}", file, name); } } else { - log.debug("Can't find provider for entry {} at {} ", entry, name); + log.debug("Can't find provider for entry {} at {}", entry, name); } // otherwise just place as file