svn commit: r887277 - /felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java

[ccustine]

Author: ccustine
Date: Fri Dec  4 17:22:09 2009
New Revision: 887277

URL: http://svn.apache.org/viewvc?rev=887277&view=rev
Log:
FELIX-1915 - [karaf] allow overridding of etc/system.properties via environment

Modified:
    felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java

Modified: 
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java?rev=887277&r1=887276&r2=887277&view=diff
==============================================================================
--- felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java 
(original)
+++ felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java 
Fri Dec  4 17:22:09 2009
@@ -697,8 +697,8 @@
         // Perform variable substitution on specified properties.
         for (Enumeration e = props.propertyNames(); e.hasMoreElements();) {
             String name = (String) e.nextElement();
-            System.setProperty(name,
-                    substVars(props.getProperty(name), name, null, null));
+            String value = System.getProperty(name, props.getProperty(name));
+            System.setProperty(name, substVars(value, name, null, null));
         }
     }