Fix possible NPE from resource loading

Fixes quarkusio#40438. (cherry picked from commit 97c797a)
gsmet · May 10, 2024 · 5b73b8f · 5b73b8f
1 parent db7d390
commit 5b73b8f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...ects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassPathElement.java b/...ects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassPathElement.java
@@ -144,6 +144,7 @@ public void close() {
     };
 
     default List<ClassPathResource> getResources(String name) {
-        return List.of(getResource(name));
+        ClassPathResource resource = getResource(name);
+        return resource == null ? List.of() : List.of(resource);
     }
 }
diff --git a/...tstrap/core/src/main/java/io/quarkus/bootstrap/classloading/PathTreeClassPathElement.java b/...tstrap/core/src/main/java/io/quarkus/bootstrap/classloading/PathTreeClassPathElement.java
@@ -113,7 +113,7 @@ public List<ClassPathResource> getResources(String name) {
         final String sanitized = sanitize(name);
         final Set<String> resources = this.resources;
         if (resources != null && !resources.contains(sanitized)) {
-            return null;
+            return List.of();
         }
         List<ClassPathResource> ret = new ArrayList<>();
         apply(tree -> {
@@ -123,7 +123,7 @@ public List<ClassPathResource> getResources(String name) {
 
                 }
             });
-            return null;
+            return List.of();
         });
         return ret;
     }