This is an automated email from the ASF dual-hosted git repository. dashorst pushed a commit to branch archive/wicket-6.x in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 6ad2f9834e02030a2d5b47ee215276b9be7e5623 Author: Sven Meier <[email protected]> AuthorDate: Thu May 28 20:20:24 2020 +0200 WICKET-6792 skip current dir dot '.' in absolute path --- .../src/main/java/org/apache/wicket/util/lang/Packages.java | 2 +- .../test/java/org/apache/wicket/util/lang/PackagesTest.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) 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 f3a66fa4f8..3f644562a5 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 @@ public final class Packages 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 e676e7f4c2..3bebd9f65c 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 @@ public class PackagesTest extends Assert 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); + } }
