fixing config reader. fixes graphhopper#551

karussell · Oct 20, 2015 · 63834d5 · 63834d5
1 parent 2e7b9ca
commit 63834d5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/core/src/main/java/com/graphhopper/util/Helper.java b/core/src/main/java/com/graphhopper/util/Helper.java
@@ -124,7 +124,7 @@ public static void loadProperties( Map<String, String> map, Reader tmpReader ) t
 
                 String field = line.substring(0, index);
                 String value = line.substring(index + 1);
-                map.put(field, value);
+                map.put(field.trim(), value.trim());
             }
         } finally
         {

diff --git a/core/src/test/java/com/graphhopper/util/HelperTest.java b/core/src/test/java/com/graphhopper/util/HelperTest.java
@@ -18,7 +18,11 @@
 package com.graphhopper.util;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 
 import org.junit.After;
 import org.junit.Test;
@@ -89,4 +93,13 @@ public void testKeepIn()
         assertEquals(3, Helper.keepIn(2, 3, 4), 1e-2);
         assertEquals(3, Helper.keepIn(-2, 3, 4), 1e-2);
     }
+
+    @Test
+    public void testLoadProperties() throws IOException
+    {
+        Map<String, String> map = new HashMap<String, String>();
+        Helper.loadProperties(map, new StringReader("blup=test\n blup2 = xy"));
+        assertEquals("test", map.get("blup"));
+        assertEquals("xy", map.get("blup2"));
+    }
 }