From 328ed31982a7d2e910c600701a6fbe6b60beb571 Mon Sep 17 00:00:00 2001 From: michaeloffner Date: Wed, 4 Sep 2024 22:47:03 +0200 Subject: [PATCH] revert because of regression --- .../commons/lang/PhysicalClassLoader.java | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/core/src/main/java/lucee/commons/lang/PhysicalClassLoader.java b/core/src/main/java/lucee/commons/lang/PhysicalClassLoader.java index a7e45f5d47..8c988a429f 100644 --- a/core/src/main/java/lucee/commons/lang/PhysicalClassLoader.java +++ b/core/src/main/java/lucee/commons/lang/PhysicalClassLoader.java @@ -39,7 +39,6 @@ import lucee.commons.io.SystemUtil; import lucee.commons.io.log.LogUtil; import lucee.commons.io.res.Resource; -import lucee.commons.io.res.filter.ExtensionResourceFilter; import lucee.commons.io.res.type.file.FileResource; import lucee.commons.io.res.util.ResourceUtil; import lucee.runtime.PageSourcePool; @@ -459,21 +458,10 @@ public static List toSortedList(Resource[] resources) { private static URL[] doURLs(Collection reses) throws IOException { List list = new ArrayList(); - addURLs(list, reses); - return list.toArray(new URL[list.size()]); - } - - private static void addURLs(List list, Collection reses) throws IOException { - for (Resource res: reses) { - if ("jar".equalsIgnoreCase(ResourceUtil.getExtension(res, null))) list.add(doURL(res)); - else if (res.isDirectory()) { - List children = new ArrayList<>(); - for (Resource child: res.listResources(new ExtensionResourceFilter(true, "jar"))) { - children.add(child); - } - addURLs(list, children); - } + for (Resource r: reses) { + if (r.isDirectory() || "jar".equalsIgnoreCase(ResourceUtil.getExtension(r, null))) list.add(doURL(r)); } + return list.toArray(new URL[list.size()]); } private static URL doURL(Resource res) throws IOException {