Fixes #5521 ResourceCollection list NPE

Ensure that dirs passed to addPath end with / so they can be detected as dirs even if they do not exist.
jetty · Oct 28, 2020 · 19596b2 · 19596b2
1 parent 6698a31
commit 19596b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaInfConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaInfConfiguration.java
@@ -206,13 +206,13 @@ else if (LOG.isDebugEnabled())
             if (target.isDirectory())
             {
                 //TODO think  how to handle an unpacked jar file (eg for osgi)
-                resourcesDir = target.addPath("/META-INF/resources");
+                resourcesDir = target.addPath("/META-INF/resources/");
             }
             else
             {
                 //Resource represents a packed jar
                 URI uri = target.getURI();
-                resourcesDir = Resource.newResource(uriJarPrefix(uri, "!/META-INF/resources"));
+                resourcesDir = Resource.newResource(uriJarPrefix(uri, "!/META-INF/resources/"));
             }
 
             if (!resourcesDir.exists() || !resourcesDir.isDirectory())
@@ -227,7 +227,7 @@ else if (LOG.isDebugEnabled())
                 if (old != null)
                     resourcesDir = old;
                 else if (LOG.isDebugEnabled())
-                    LOG.debug(target + " META-INF/resources cache updated");
+                    LOG.debug(target + " META-INF/resources/ cache updated");
             }
 
             if (resourcesDir == EmptyResource.INSTANCE)

diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
@@ -907,7 +907,7 @@ protected List<Resource> findWebInfLibJars(WebAppContext context)
             return null;
 
         List<Resource> jarResources = new ArrayList<>();
-        Resource webInfLib = webInf.addPath("/lib");
+        Resource webInfLib = webInf.addPath("lib/");
         if (webInfLib.exists() && webInfLib.isDirectory())
         {
             String[] files = webInfLib.list();