You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2020/05/28 21:23:16 UTC
[wicket] branch wicket-7.x updated: WICKET-6792 skip current dir
dot '.' in absolute path
This is an automated email from the ASF dual-hosted git repository.
svenmeier pushed a commit to branch wicket-7.x
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/wicket-7.x by this push:
new 78508f8 WICKET-6792 skip current dir dot '.' in absolute path
78508f8 is described below
commit 78508f8e26773053b2b629b22a0fe59fa9f46b60
Author: Sven Meier <sv...@apache.org>
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 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 @@ 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 7b9be38..e41e37b 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
@@ -87,4 +87,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);
+ }
}