From notifications-return-4994-archive-asf-public=cust-asf.ponee.io@freemarker.incubator.apache.org Sun Feb 4 13:06:56 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 5572518064A for ; Sun, 4 Feb 2018 13:06:56 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 44EB9160C40; Sun, 4 Feb 2018 12:06:56 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8C431160C37 for ; Sun, 4 Feb 2018 13:06:55 +0100 (CET) Received: (qmail 63048 invoked by uid 500); 4 Feb 2018 12:06:54 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 63039 invoked by uid 99); 4 Feb 2018 12:06:54 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Feb 2018 12:06:54 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id D9F721A0129 for ; Sun, 4 Feb 2018 12:06:53 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.231 X-Spam-Level: X-Spam-Status: No, score=-4.231 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id PaLY1k4UImRZ for ; Sun, 4 Feb 2018 12:06:52 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 77EA85FB55 for ; Sun, 4 Feb 2018 12:06:51 +0000 (UTC) Received: (qmail 63026 invoked by uid 99); 4 Feb 2018 12:06:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Feb 2018 12:06:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A47EFDFF8B; Sun, 4 Feb 2018 12:06:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-freemarker git commit: Code cleanup for last commit... Date: Sun, 4 Feb 2018 12:06:50 +0000 (UTC) Repository: incubator-freemarker Updated Branches: refs/heads/2.3-gae db7c6d547 -> 4ba637f15 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-gae Commit: 4ba637f15948ce5d4bec7e8a1ecaacd4d4502e3c Parents: db7c6d5 Author: ddekany Authored: Sun Feb 4 13:06:43 2018 +0100 Committer: ddekany 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(); + } } }