You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2009/08/31 11:13:21 UTC
svn commit: r809511 -
/sling/trunk/installer/jcr/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstaller.java
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;
}