Fix #5220: NPE surfaced by EmptyStringToNullELResolver

eclipse-ee4j · May 13, 2023 · a633a96 · a633a96
1 parent 63e6bef
commit a633a96
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/impl/src/main/java/com/sun/faces/application/SharedUtils.java b/impl/src/main/java/com/sun/faces/application/SharedUtils.java
@@ -16,13 +16,13 @@
 
 package com.sun.faces.application;
 
-import javax.faces.context.FacesContext;
-import javax.faces.application.Application;
-
-import java.util.List;
 import java.util.ArrayList;
-import java.util.Map;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.application.Application;
+import javax.faces.context.FacesContext;
 
 class SharedUtils {
 
@@ -77,7 +77,9 @@ static List<String> evaluateExpressions(FacesContext context, List<String> value
                     if (isExpression(value)) {
                         value = app.evaluateExpressionGet(context, value, String.class);
                     }
-                    ret.add(value);
+                    if (value != null) {
+                        ret.add(value);
+                    }
                 }
             }