You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2010/09/13 16:17:11 UTC
svn commit: r996550 -
/karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
Author: gnodet
Date: Mon Sep 13 14:17:11 2010
New Revision: 996550
URL: http://svn.apache.org/viewvc?rev=996550&view=rev
Log:
KARAF-145: Reading Properties like karaf.framework should be trimmed before reusage
Modified:
karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java?rev=996550&r1=996549&r2=996550&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java Mon Sep 13 14:17:11 2010
@@ -847,6 +847,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;
}