Skip to content

Commit be9849a

Browse files
committed
TemplateProcessingTracer: Pass the element to exitElement too.
1 parent 9cc2b9c commit be9849a

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

freemarker-core/src/main/java/freemarker/core/Environment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2919,7 +2919,7 @@ private void pushElement(TemplateElement element) {
29192919
private void popElement() {
29202920
if (templateProcessingTracer != null) {
29212921
TemplateElement element = instructionStack[instructionStackSize - 1];
2922-
templateProcessingTracer.exitElement(this);
2922+
templateProcessingTracer.exitElement(this, element);
29232923
}
29242924
instructionStackSize--;
29252925
}

freemarker-core/src/main/java/freemarker/core/ListElseContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ TemplateElement[] accept(Environment env) throws TemplateException, IOException
4747
try {
4848
hadItems = listPart.acceptWithResult(env);
4949
} finally {
50-
templateProcessingTracer.exitElement(env);
50+
templateProcessingTracer.exitElement(env, listPart);
5151
}
5252
}
5353

freemarker-core/src/main/java/freemarker/core/TemplateProcessingTracer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public interface TemplateProcessingTracer {
4848
*
4949
* @since 2.3.23
5050
*/
51-
void exitElement(Environment env);
51+
void exitElement(Environment env, TracedElement tracedElement);
5252

5353
/**
5454
* Information about the template element that we enter of exit.

freemarker-core/src/test/java/freemarker/core/TemplateProcessingTracerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ public void enterElement(Environment env, TracedElement tracedElement) {
238238
}
239239
}
240240

241-
public void exitElement(Environment env) {
241+
public void exitElement(Environment env, TracedElement tracedElement) {
242242
indentation = indentation.isEmpty() ? null : indentation.substring(0, indentation.length() - 1);
243243
}
244244
}

0 commit comments

Comments
 (0)