From 31dc5fff6066f625cd6eae29e273b96e5bfe80b6 Mon Sep 17 00:00:00 2001 From: jpeterson Date: Mon, 28 Aug 2017 14:38:42 -0400 Subject: [PATCH] Pass resolved expressions up parent context chain --- src/main/java/com/hubspot/jinjava/el/ExpressionResolver.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/hubspot/jinjava/el/ExpressionResolver.java b/src/main/java/com/hubspot/jinjava/el/ExpressionResolver.java index 362c0f2d4..2943e647f 100644 --- a/src/main/java/com/hubspot/jinjava/el/ExpressionResolver.java +++ b/src/main/java/com/hubspot/jinjava/el/ExpressionResolver.java @@ -3,6 +3,7 @@ import static org.apache.commons.lang3.exception.ExceptionUtils.getRootCauseMessage; import java.util.List; +import java.util.Optional; import javax.el.ELException; import javax.el.ExpressionFactory; @@ -61,6 +62,7 @@ public Object resolveExpression(String expression) { } interpreter.getContext().addResolvedExpression(expression.trim()); + Optional.ofNullable(interpreter.getContext().getParent()).ifPresent(parent -> parent.addResolvedExpression(expression.trim())); try { String elExpression = "#{" + expression.trim() + "}";