PathConverter fails for file paths with spaces. Fixes x-stream#52.

snube · Apr 20, 2016 · 163de5d · 163de5d
1 parent 5a42c74
commit 163de5d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/xstream-distribution/src/content/changes.html b/xstream-distribution/src/content/changes.html
@@ -63,6 +63,12 @@ <h1 id="upcoming-1.4.x">Upcoming 1.4.x maintenance release</h1>
 
     <p>Not yet released.</p>
 
+    <h2>Minor changes</h2>
+
+    <ul>
+    	<li>GHI:#52: PathConverter fails for file paths with spaces.</li>
+    </ul>
+
     <h2>API changes</h2>
 
     <ul>

diff --git a/xstream/src/java/com/thoughtworks/xstream/converters/extended/PathConverter.java b/xstream/src/java/com/thoughtworks/xstream/converters/extended/PathConverter.java
@@ -43,7 +43,7 @@ public Object fromString(final String str) {
                 return Paths.get(uri);
             }
         } catch (final URISyntaxException e) {
-            throw new ConversionException(e);
+            return Paths.get(str);
         }
     }
 

diff --git a/xstream/src/test/com/thoughtworks/acceptance/Extended17TypesTest.java b/xstream/src/test/com/thoughtworks/acceptance/Extended17TypesTest.java
@@ -43,6 +43,12 @@ public void testPathOfDefaultFileSystem() {
         assertBothWays(Paths.get(uri), "<path>" + absolutePathName + "</path>");
     }
 
+    public void testPathWithSpecialCharacters() {
+        assertBothWays(Paths.get("with space"), "<path>with space</path>");
+        assertBothWays(Paths.get("with+plus"), "<path>with+plus</path>");
+        assertBothWays(Paths.get("with&ampersand"), "<path>with&amp;ampersand</path>");
+    }
+
     public void testPathOfNonDefaultFileSystem() throws IOException {
         final Map<String, String> env = new HashMap<>();
         env.put("create", "true");