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 E388B10084 for ; Thu, 3 Oct 2013 08:55:39 +0000 (UTC) Received: (qmail 90882 invoked by uid 500); 3 Oct 2013 08:55:39 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 90840 invoked by uid 500); 3 Oct 2013 08:55:39 -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 90832 invoked by uid 99); 3 Oct 2013 08:55:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Oct 2013 08:55:39 +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 08:55:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D67BF23889FA; Thu, 3 Oct 2013 08:55:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1528756 - /sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java Date: Thu, 03 Oct 2013 08:55:15 -0000 To: commits@sling.apache.org From: olli@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131003085515.D67BF23889FA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olli Date: Thu Oct 3 08:55:15 2013 New Revision: 1528756 URL: http://svn.apache.org/r1528756 Log: SLING-2917 remove unused param session from method importParentNode(Session, Bundle, String, Node, DefaultContentCreator):URL 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=1528756&r1=1528755&r2=1528756&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 08:55:15 2013 @@ -329,7 +329,7 @@ public class Loader extends BaseImportLo } // potential parent node import/extension - URL parentNodeDescriptor = importParentNode(parent.getSession(), bundle, path, parent, contentCreator); + URL parentNodeDescriptor = importParentNode(bundle, path, parent, contentCreator); if (parentNodeDescriptor != null) { processedEntries.put(parentNodeDescriptor.toString(), parent); } @@ -755,7 +755,7 @@ public class Loader extends BaseImportLo * Imports mixin nodes and properties (and optionally child nodes) of the * parent node. */ - private URL importParentNode(Session session, Bundle bundle, String path, Node parent, final DefaultContentCreator contentCreator) throws RepositoryException { + private URL importParentNode(Bundle bundle, String path, Node parent, final DefaultContentCreator contentCreator) throws RepositoryException { final Descriptor descriptor = getParentNodeDescriptor(bundle, path, contentCreator); // no parent descriptor (ROOT) found