Pass resolved expressions up parent context chain

HubSpot · Aug 28, 2017 · 31dc5ff · 31dc5ff · boulter · Aug 28, 2017
1 parent 0c15fa0
commit 31dc5ff
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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() + "}";