- Require non-null inner expression in foreach.

- Let null conversion buble up.

1 files changed, 5 insertions, 2 deletions

diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java
index b7339975503..25ac948c435 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java
@@ -11,6 +11,8 @@ import com.yahoo.vespa.indexinglanguage.FieldValueConverter;
 import com.yahoo.vespa.objects.ObjectOperation;
 import com.yahoo.vespa.objects.ObjectPredicate;
 
+import java.util.Objects;
+
 /**
  * @author Simon Thoresen Hult
  */
@@ -20,7 +22,7 @@ public final class ForEachExpression extends CompositeExpression {
 
     public ForEachExpression(Expression exp) {
         super(UnresolvedDataType.INSTANCE);
-        this.exp = exp;
+        this.exp = Objects.requireNonNull(exp);
     }
 
     public Expression getInnerExpression() {
@@ -29,7 +31,8 @@ public final class ForEachExpression extends CompositeExpression {
 
     @Override
     public ForEachExpression convertChildren(ExpressionConverter converter) {
-        return new ForEachExpression(converter.convert(exp));
+        Expression converted = converter.convert(exp);
+        return converted != null ?  new ForEachExpression(converted) : null;
     }
 
     @Override