Merge pull request #5194 from zfqjava/master

fix NPE if getResourcePaths return null
eclipse-ee4j · Jan 26, 2023 · 91958aa · 91958aa
2 parents 056dde4 + f3079f5
commit 91958aa
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/impl/src/main/java/com/sun/faces/application/resource/ResourcePathsIterator.java b/impl/src/main/java/com/sun/faces/application/resource/ResourcePathsIterator.java
@@ -64,7 +64,10 @@ public String next() {
     }
 
     private void visit(String resourcePath) {
-        stack.addAll(externalContext.getResourcePaths(resourcePath));
+        java.util.Set<String> set = externalContext.getResourcePaths(resourcePath);
+        if(set != null) {
+            stack.addAll(set);
+        }
     }
 
     private void tryTake() {