This API should actually not return null

apache · Jun 29, 2023 · 341ee31 · 341ee31 · michael-o · Jun 29, 2023
1 parent 430ae2e
commit 341ee31
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/java/org/apache/catalina/Context.java b/java/org/apache/catalina/Context.java
@@ -1989,18 +1989,16 @@ default Resource findConfigFileResource(String name) throws IOException {
         if (name.startsWith(WEBAPP_PROTOCOL)) {
             String path = name.substring(WEBAPP_PROTOCOL.length());
             WebResource resource = getResources().getResource(path);
-            if (resource.canRead()) {
+            if (resource.canRead() && resource.isFile()) {
                 InputStream stream = resource.getInputStream();
                 try {
                     return new Resource(stream, resource.getURL().toURI());
                 } catch (URISyntaxException e) {
                     stream.close();
                 }
             }
-            return null;
-        } else {
-            return ConfigFileLoader.getSource().getResource(name);
         }
+        return ConfigFileLoader.getSource().getResource(name);
     }
 
 }