Issue #10084 - Introduce trailing slash only on ServletContext.getRes…

…ourcePaths(String) again
jetty · Jul 10, 2023 · 4927b1d · 4927b1d
1 parent f57cb04
commit 4927b1d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/...etty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java b/...etty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java
@@ -815,7 +815,12 @@ public Set<String> getResourcePaths(String path)
 
             HashSet<String> set = new HashSet<>();
             for (Resource item: resource.list())
-                set.add(path + item.getFileName());
+            {
+                String entry = path + item.getFileName();
+                if (item.isDirectory())
+                    entry = entry + '/';
+                set.add(entry);
+            }
             return set;
         }
         catch (Exception e)

diff --git a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ContextHandler.java b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ContextHandler.java
@@ -1573,10 +1573,12 @@ public Set<String> getResourcePaths(String path)
 
             HashSet<String> set = new HashSet<>();
 
-            for (Resource r: resource)
+            for (Resource item: resource.list())
             {
-                for (Resource item: r.list())
-                    set.add(path + item.getFileName());
+                String entry = path + item.getFileName();
+                if (item.isDirectory())
+                    entry = entry + '/';
+                set.add(entry);
             }
             return set;
         }