From notifications-return-4990-archive-asf-public=cust-asf.ponee.io@freemarker.incubator.apache.org Sun Feb 4 02:41:38 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 C95EF180621 for ; Sun, 4 Feb 2018 02:41:38 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B93DE160C38; Sun, 4 Feb 2018 01:41:38 +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 0BED7160C58 for ; Sun, 4 Feb 2018 02:41:37 +0100 (CET) Received: (qmail 97249 invoked by uid 500); 4 Feb 2018 01:41:37 -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 97239 invoked by uid 99); 4 Feb 2018 01:41:37 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Feb 2018 01:41:37 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 9854E180893 for ; Sun, 4 Feb 2018 01:41:36 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -11.731 X-Spam-Level: X-Spam-Status: No, score=-11.731 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, USER_IN_DEF_SPF_WL=-7.5] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 4TKMMWV0l0fX for ; Sun, 4 Feb 2018 01:41:35 +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 402085F260 for ; Sun, 4 Feb 2018 01:41:34 +0000 (UTC) Received: (qmail 97192 invoked by uid 99); 4 Feb 2018 01:41:33 -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 01:41:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 52BDBE9434; Sun, 4 Feb 2018 01:41:33 +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 Date: Sun, 04 Feb 2018 01:41:34 -0000 Message-Id: <9bedb3a56b3740c6a2871a9fe0f73827@git.apache.org> In-Reply-To: <24062d6dbfe44a158a45442d901269ca@git.apache.org> References: <24062d6dbfe44a158a45442d901269ca@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-freemarker git commit: Forward ported FREEMARKER-88 (code clarity only; it doesn't cause problem in FM3) Forward ported FREEMARKER-88 (code clarity only; it doesn't cause problem in FM3) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/be2d4fcc Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/be2d4fcc Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/be2d4fcc Branch: refs/heads/3 Commit: be2d4fcc48361fdb677c0765ad8eee90ba952e3a Parents: a937af0 Author: ddekany Authored: Sun Feb 4 02:40:47 2018 +0100 Committer: ddekany Committed: Sun Feb 4 02:41:26 2018 +0100 ---------------------------------------------------------------------- .../org/apache/freemarker/servlet/jsp/JspTagModelBase.java | 2 +- .../freemarker/servlet/jsp/SimpleTagDirectiveModel.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/be2d4fcc/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java index 3e01c54..7205702 100644 --- a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java +++ b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java @@ -138,7 +138,7 @@ abstract class JspTagModelBase implements TemplateModelWithOriginName { throw (TemplateException) e; } if (e instanceof TemplateExceptionWrapperJspException) { - return (TemplateException) e.getCause(); + return ((TemplateExceptionWrapperJspException) e).getCause(); } return new TemplateException(e, "Error while invoking the ", new _DelayedJQuote(tagName), " JSP custom tag; see cause exception"); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/be2d4fcc/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java index 28155d7..619b8c6 100644 --- a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java +++ b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java @@ -118,10 +118,15 @@ class SimpleTagDirectiveModel extends JspTagModelBase implements TemplateDirecti static final class TemplateExceptionWrapperJspException extends JspException { - public TemplateExceptionWrapperJspException(Throwable cause) { + public TemplateExceptionWrapperJspException(TemplateException cause) { super("Nested content has thrown template exception", cause); } + @Override + public TemplateException getCause() { + return (TemplateException) super.getCause(); + } + } }