incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1225195 - /sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
Date Wed, 28 Dec 2011 14:45:44 GMT
Author: cziegeler
Date: Wed Dec 28 14:45:43 2011
New Revision: 1225195

URL: http://svn.apache.org/viewvc?rev=1225195&view=rev
Log:
SLING-1338 : sling.properties should be trimmed when reading

Modified:
    sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java

Modified: sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java?rev=1225195&r1=1225194&r2=1225195&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
(original)
+++ sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
Wed Dec 28 14:45:43 2011
@@ -924,7 +924,8 @@ public class Sling {
             tmp.load(ins);
 
             for (Map.Entry<Object, Object> entry : tmp.entrySet()) {
-                props.put((String) entry.getKey(), (String) entry.getValue());
+                final String value = (String)entry.getValue();
+                props.put((String) entry.getKey(), (value == null ? null : value.trim()));
             }
         } finally {
             try {



Mime
View raw message