Author: gnodet Date: Tue Sep 21 12:01:56 2010 New Revision: 999359 URL: http://svn.apache.org/viewvc?rev=999359&view=rev Log: KARAF-145: Reading Properties like karaf.framework should be trimmed before reusage
Modified: karaf/branches/karaf-2.0.x/main/src/main/java/org/apache/karaf/main/Main.java Modified: karaf/branches/karaf-2.0.x/main/src/main/java/org/apache/karaf/main/Main.java URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.0.x/main/src/main/java/org/apache/karaf/main/Main.java?rev=999359&r1=999358&r2=999359&view=diff ============================================================================== --- karaf/branches/karaf-2.0.x/main/src/main/java/org/apache/karaf/main/Main.java (original) +++ karaf/branches/karaf-2.0.x/main/src/main/java/org/apache/karaf/main/Main.java Tue Sep 21 12:01:56 2010 @@ -834,6 +834,13 @@ public class Main { } configProps.remove(INCLUDES_PROPERTY); } + for (Enumeration e = configProps.propertyNames(); e.hasMoreElements();) { + Object key = e.nextElement(); + if (key instanceof String) { + String v = configProps.getProperty((String) key); + configProps.put(key, v.trim()); + } + } return configProps; }