You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2017/09/08 08:45:48 UTC

svn commit: r1807685 - in /felix/trunk/utils/src: main/java/org/apache/felix/utils/properties/ConfigurationHandler.java test/java/org/apache/felix/utils/properties/TypedPropertiesTest.java

Author: gnodet
Date: Fri Sep  8 08:45:48 2017
New Revision: 1807685

URL: http://svn.apache.org/viewvc?rev=1807685&view=rev
Log:
[FELIX-5145] FileInstall writes .config files back with backslashes escaping spaces in config values

Modified:
    felix/trunk/utils/src/main/java/org/apache/felix/utils/properties/ConfigurationHandler.java
    felix/trunk/utils/src/test/java/org/apache/felix/utils/properties/TypedPropertiesTest.java

Modified: felix/trunk/utils/src/main/java/org/apache/felix/utils/properties/ConfigurationHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/utils/src/main/java/org/apache/felix/utils/properties/ConfigurationHandler.java?rev=1807685&r1=1807684&r2=1807685&view=diff
==============================================================================
--- felix/trunk/utils/src/main/java/org/apache/felix/utils/properties/ConfigurationHandler.java (original)
+++ felix/trunk/utils/src/main/java/org/apache/felix/utils/properties/ConfigurationHandler.java Fri Sep  8 08:45:48 2017
@@ -834,7 +834,6 @@ public class ConfigurationHandler
             {
                 case '\\':
                 case TOKEN_VAL_CLOS:
-                case ' ':
                 case TOKEN_EQ:
                     out.write( '\\' );
                     out.write( c );

Modified: felix/trunk/utils/src/test/java/org/apache/felix/utils/properties/TypedPropertiesTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/utils/src/test/java/org/apache/felix/utils/properties/TypedPropertiesTest.java?rev=1807685&r1=1807684&r2=1807685&view=diff
==============================================================================
--- felix/trunk/utils/src/test/java/org/apache/felix/utils/properties/TypedPropertiesTest.java (original)
+++ felix/trunk/utils/src/test/java/org/apache/felix/utils/properties/TypedPropertiesTest.java Fri Sep  8 08:45:48 2017
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -111,4 +112,15 @@ public class TypedPropertiesTest extends
         properties.save(sw);
         assertEquals(str, sw.toString());
     }
+
+    public void testWriteTypedPropsStringWithSpaces() throws IOException
+    {
+        TypedProperties properties = new TypedProperties();
+        properties.put("key", 3); // force the config to be typed
+        properties.put("key", "s 1");
+        StringWriter sw = new StringWriter();
+        properties.save(sw);
+        assertEquals("key = \"s 1\"\n", sw.toString());
+    }
+
 }