| commit | 6ad2f9834e02030a2d5b47ee215276b9be7e5623 | [log] [tgz] |
|---|---|---|
| author | Sven Meier <svenmeier@apache.org> | Thu May 28 20:20:24 2020 +0200 |
| committer | Sven Meier <svenmeier@apache.org> | Fri May 29 13:08:03 2020 +0200 |
| tree | bad230cdc86f9cf4607de57fc85a71537b1032c2 | |
| parent | e9ada87bf6136953bd10f86c9a1c6812ee1d73b3 [diff] |
WICKET-6792 skip current dir dot '.' in absolute path
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/lang/Packages.java b/wicket-util/src/main/java/org/apache/wicket/util/lang/Packages.java index f3a66fa..3f64456 100755 --- a/wicket-util/src/main/java/org/apache/wicket/util/lang/Packages.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/lang/Packages.java
@@ -106,7 +106,7 @@ throw new IllegalArgumentException("Invalid path " + path); } } - else + else if (".".equals(folder) == false) { // Add to stack absolutePath.add(folder);
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/PackagesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/PackagesTest.java index e676e7f..3bebd9f 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/lang/PackagesTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/PackagesTest.java
@@ -86,4 +86,17 @@ String absolutePath = Packages.absolutePath(packageName, relativePath); assertEquals("com/foo/bar/baz/foo/qux", absolutePath); } + + /** + * WICKET-6792 + */ + @Test + public void absolutePath6() throws Exception + { + String packageName = "com.foo.bar"; + String relativePath = "./baz"; + + String absolutePath = Packages.absolutePath(packageName, relativePath); + assertEquals("com/foo/bar/baz", absolutePath); + } }