Code cleanup for last commit...
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/4ba637f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/4ba637f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/4ba637f1 Branch: refs/heads/2.3 Commit: 4ba637f15948ce5d4bec7e8a1ecaacd4d4502e3c Parents: db7c6d5 Author: ddekany <ddek...@apache.org> Authored: Sun Feb 4 13:06:43 2018 +0100 Committer: ddekany <ddek...@apache.org> Committed: Sun Feb 4 13:06:43 2018 +0100 ---------------------------------------------------------------------- .../freemarker/ext/jsp/TagTransformModel.java | 32 +++++++++----------- 1 file changed, 15 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4ba637f1/src/main/java/freemarker/ext/jsp/TagTransformModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/ext/jsp/TagTransformModel.java b/src/main/java/freemarker/ext/jsp/TagTransformModel.java index 0190948..55b0272 100644 --- a/src/main/java/freemarker/ext/jsp/TagTransformModel.java +++ b/src/main/java/freemarker/ext/jsp/TagTransformModel.java @@ -292,7 +292,7 @@ class TagTransformModel extends JspTagModelBase implements TemplateTransformMode private final FreeMarkerPageContext pageContext; private boolean needPop = true; private final boolean needDoublePop; - private boolean colosed = false; + private boolean closed = false; TagWriter(Writer out, Tag tag, FreeMarkerPageContext pageContext, boolean needDoublePop) { super((JspWriter) out, false); @@ -394,27 +394,25 @@ class TagTransformModel extends JspTagModelBase implements TemplateTransformMode @Override public void close() { - if (colosed) { + if (closed) { return; } + closed = true; + + if (needPop) { + pageContext.popWriter(); + } + pageContext.popTopTag(); try { - if (needPop) { - pageContext.popWriter(); - } - pageContext.popTopTag(); - try { - if (isTryCatchFinally) { - ((TryCatchFinally) tag).doFinally(); - } - // No pooling yet - tag.release(); - } finally { - if (needDoublePop) { - pageContext.popWriter(); - } + if (isTryCatchFinally) { + ((TryCatchFinally) tag).doFinally(); } + // No pooling yet + tag.release(); } finally { - colosed = true; + if (needDoublePop) { + pageContext.popWriter(); + } } }
