Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 7212 invoked from network); 31 Aug 2009 09:13:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 31 Aug 2009 09:13:46 -0000 Received: (qmail 91781 invoked by uid 500); 31 Aug 2009 09:13:45 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 91728 invoked by uid 500); 31 Aug 2009 09:13:45 -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 91719 invoked by uid 99); 31 Aug 2009 09:13:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Aug 2009 09:13:45 +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; Mon, 31 Aug 2009 09:13:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D9B8E23888E9; Mon, 31 Aug 2009 09:13:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r809511 - /sling/trunk/installer/jcr/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstaller.java Date: Mon, 31 Aug 2009 09:13:21 -0000 To: commits@sling.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090831091321.D9B8E23888E9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Mon Aug 31 09:13:18 2009 New Revision: 809511 URL: http://svn.apache.org/viewvc?rev=809511&view=rev Log: SLING-1078 - get properties from BundleContext first, we want system properties to override configs Modified: sling/trunk/installer/jcr/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstaller.java Modified: sling/trunk/installer/jcr/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstaller.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/jcr/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstaller.java?rev=809511&r1=809510&r2=809511&view=diff ============================================================================== --- sling/trunk/installer/jcr/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstaller.java (original) +++ sling/trunk/installer/jcr/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstaller.java Mon Aug 31 09:13:18 2009 @@ -234,9 +234,9 @@ /** Get a property value from the component context or bundle context */ protected Object getPropertyValue(ComponentContext ctx, String name) { - Object result = ctx.getProperties().get(name); + Object result = ctx.getBundleContext().getProperty(name); if(result == null) { - result = ctx.getBundleContext().getProperty(name); + result = ctx.getProperties().get(name); } return result; }