When not using eager execution, don't modify the non-meta context

variables

Author: jasmith-hs

src/main/java/com/hubspot/jinjava/lib/tag/ForTag.java

@@ -163,7 +163,6 @@ public String renderForCollection(
   ) {
     ForLoop loop = ObjectIterator.getLoop(collection);
 
-    interpreter.getContext().addNonMetaContextVariables(loopVars);
     try (InterpreterScopeClosable c = interpreter.enterScope()) {
       if (interpreter.isValidationMode() && !loop.hasNext()) {
         loop = ObjectIterator.getLoop(new DummyObject());
@@ -292,8 +291,6 @@ public String renderForCollection(
         }
       }
       return checkLoopVariable(interpreter, buff);
-    } finally {
-      interpreter.getContext().removeNonMetaContextVariables(loopVars);
     }
   }
 

src/main/java/com/hubspot/jinjava/lib/tag/eager/EagerForTag.java

@@ -56,16 +56,26 @@ public String innerInterpret(TagNode tagNode, JinjavaInterpreter interpreter) {
       EagerExecutionResult result = EagerContextWatcher.executeInChildContext(
         eagerInterpreter -> {
           EagerExpressionResult expressionResult = EagerExpressionResult.fromSupplier(
-            () ->
-              getTag()
-                .renderForCollection(
-                  tagNode,
-                  eagerInterpreter,
-                  loopVarsAndExpression.getLeft(),
-                  !collectionResult.getResult().toList().isEmpty()
-                    ? collectionResult.getResult().toList().get(0)
-                    : Collections.emptyList()
-                ),
+            () -> {
+              try {
+                interpreter
+                  .getContext()
+                  .addNonMetaContextVariables(loopVarsAndExpression.getLeft());
+                return getTag()
+                  .renderForCollection(
+                    tagNode,
+                    eagerInterpreter,
+                    loopVarsAndExpression.getLeft(),
+                    !collectionResult.getResult().toList().isEmpty()
+                      ? collectionResult.getResult().toList().get(0)
+                      : Collections.emptyList()
+                  );
+              } finally {
+                interpreter
+                  .getContext()
+                  .removeNonMetaContextVariables(loopVarsAndExpression.getLeft());
+              }
+            },
             eagerInterpreter
           );
           addedTokens.addAll(eagerInterpreter.getContext().getDeferredTokens());