fix to find correct resource without "/" in class loader

zkoss · Sep 6, 2023 · 00bdb92 · 00bdb92
1 parent 9b8c9a9
commit 00bdb92
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/zcommon/src/main/java/org/zkoss/util/resource/ClassLocator.java b/zcommon/src/main/java/org/zkoss/util/resource/ClassLocator.java
@@ -233,8 +233,14 @@ public String getDirectory() {
 	public URL getResource(String name) {
 		// no need to use Classes.getContextClassLoader() here because of the loading order issue
 		final ClassLoader cl = Thread.currentThread().getContextClassLoader();
-		final URL url = cl != null ? cl.getResource(resolveName(name)): null;
-		return url != null ? url: ClassLocator.class.getResource(name);
+		URL url = cl != null ? cl.getResource(resolveName(name)): null;
+		if (url != null) {
+			return url;
+		} else {
+			url = ClassLocator.class.getResource(name);
+		}
+		// fix if name is not starts with "/", then The getClassLoader() can find the current one.
+		return url != null ? url : ClassLocator.class.getClassLoader().getResource(name);
 	}
 	public InputStream getResourceAsStream(String name) {
 		// no need to use Classes.getContextClassLoader() here because of the loading order issue