diff --git a/impl/src/main/java/com/sun/faces/application/SharedUtils.java b/impl/src/main/java/com/sun/faces/application/SharedUtils.java index 48049c3022..40a0632c37 100644 --- 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 evaluateExpressions(FacesContext context, List value if (isExpression(value)) { value = app.evaluateExpressionGet(context, value, String.class); } - ret.add(value); + if (value != null) { + ret.add(value); + } } }