This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-2.23.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit c46cae7c77bf02257642f69a914111645edb48e8 Author: cblamauer <52042437+cblama...@users.noreply.github.com> AuthorDate: Thu Jun 20 17:21:52 2019 +0200 CAMEL-13667 Windows network UNC paths not treated correctly (File2/tempPrefix) test --- camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java b/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java index 59a2e82..4b024e3 100644 --- a/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java +++ b/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java @@ -171,6 +171,8 @@ public class FileUtilTest extends Assert { assertEquals("foo\\bar\\baz", FileUtil.compactPath("foo\\bar\\.\\baz")); assertEquals("foo\\bar\\baz", FileUtil.compactPath("foo\\bar\\\\baz")); assertEquals("\\foo\\bar\\baz", FileUtil.compactPath("\\foo\\bar\\baz")); + // Test that multiple back-slashes at the beginning are preserved, this is necessary for network UNC paths. + assertEquals("\\\\foo\\bar\\baz", FileUtil.compactPath("\\\\foo\\bar\\baz")); assertEquals("\\", FileUtil.compactPath("\\")); assertEquals("\\", FileUtil.compactPath("/")); assertEquals("/", FileUtil.compactPath("\\", '/')); @@ -190,6 +192,8 @@ public class FileUtilTest extends Assert { assertEquals("foo/bar/baz", FileUtil.compactPath("foo/bar/./baz")); assertEquals("foo/bar/baz", FileUtil.compactPath("foo/bar//baz")); assertEquals("/foo/bar/baz", FileUtil.compactPath("/foo/bar/baz")); + // Do not preserve multiple slashes at the beginning if not on Windows. + assertEquals("/foo/bar/baz", FileUtil.compactPath("//foo/bar/baz")); assertEquals("/", FileUtil.compactPath("/")); assertEquals("/", FileUtil.compactPath("\\")); assertEquals("/", FileUtil.compactPath("/", '/'));