PR

Author: abarrafo

src/main/java/com/hubspot/jinjava/lib/expression/DefaultExpressionStrategy.java

@@ -22,6 +22,16 @@ public RenderedOutputNode interpretOutput(
       master.getExpr(),
       master.getLineNumber()
     );
+
+    final FeatureActivationStrategy feat = interpreter
+      .getConfig()
+      .getFeatures()
+      .getActivationStrategy(ECHO_UNDEFINED);
+
+    if (var == null && feat.isActive(interpreter.getContext())) {
+      return new RenderedOutputNode(master.getImage());
+    }
+
     String result = interpreter.getAsString(var);
 
     if (interpreter.getConfig().isNestedInterpretationEnabled()) {
@@ -43,14 +53,6 @@ public RenderedOutputNode interpretOutput(
     if (interpreter.getContext().isAutoEscape() && !(var instanceof SafeString)) {
       result = EscapeFilter.escapeHtmlEntities(result);
     }
-    final FeatureActivationStrategy feat = interpreter
-          .getConfig()
-          .getFeatures()
-          .getActivationStrategy(ECHO_UNDEFINED);
-
-  if (result.isEmpty() && feat.isActive(interpreter.getContext())){
-      result = master.getImage();
-  }
 
     return new RenderedOutputNode(result);
   }

src/test/java/com/hubspot/jinjava/tree/ExpressionNodeTest.java

@@ -133,24 +133,26 @@ public void itRendersStringRange() throws Exception {
   }
 
   @Test
-  public void itRenderDebugUndefined() {
-
+  public void itRenderEchoUndefined() {
     final JinjavaConfig config = JinjavaConfig
-            .newBuilder()
-            .withFeatureConfig(FeatureConfig
-                    .newBuilder()
-                    .add(ECHO_UNDEFINED, FeatureStrategies.ACTIVE).build())
-            .build();
+      .newBuilder()
+      .withFeatureConfig(
+        FeatureConfig.newBuilder().add(ECHO_UNDEFINED, FeatureStrategies.ACTIVE).build()
+      )
+      .build();
     final JinjavaInterpreter jinjavaInterpreter = new Jinjava(config).newInterpreter();
     jinjavaInterpreter.getContext().put("subject", "this");
 
-    String template = "{{ subject | capitalize() }} expression {{ testing.template('hello_world') }} " +
-            "has a {{ unknown | lower() }} " +
-            "token but {{ unknown | default(\"replaced\") }}";
+    String template =
+      "{{ subject | capitalize() }} expression {{ testing.template('hello_world') }} " +
+      "has a {{ unknown | lower() }} " +
+      "token but {{ unknown | default(\"replaced\") }} and empty {{ '' }}";
     Node node = new TreeParser(jinjavaInterpreter, template).buildTree();
     assertThat(jinjavaInterpreter.render(node))
-            .isEqualTo("This expression {{ testing.template('hello_world') }} " +
-                    "has a {{ unknown | lower() }} token but replaced");
+      .isEqualTo(
+        "This expression {{ testing.template('hello_world') }} " +
+        "has a {{ unknown | lower() }} token but replaced and empty "
+      );
   }
 
   @Test