Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3A25F200CB9 for ; Sun, 2 Jul 2017 19:12:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 38B7B160BFE; Sun, 2 Jul 2017 17:12:15 +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 7E57E160BDD for ; Sun, 2 Jul 2017 19:12:14 +0200 (CEST) Received: (qmail 63431 invoked by uid 500); 2 Jul 2017 17:12:13 -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 63422 invoked by uid 99); 2 Jul 2017 17:12:13 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Jul 2017 17:12:13 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 3D131C029F for ; Sun, 2 Jul 2017 17:12:13 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-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 (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id QzCVTlx_uskc for ; Sun, 2 Jul 2017 17:12:12 +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 3E6A860CD3 for ; Sun, 2 Jul 2017 17:12:11 +0000 (UTC) Received: (qmail 62896 invoked by uid 99); 2 Jul 2017 17:12:10 -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, 02 Jul 2017 17:12:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 97D79E3AA7; Sun, 2 Jul 2017 17:12:09 +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, 02 Jul 2017 17:12:09 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-freemarker git commit: (JavaDoc improvement) archived-at: Sun, 02 Jul 2017 17:12:15 -0000 Repository: incubator-freemarker Updated Branches: refs/heads/2.3-gae 387dcd44f -> 5d81db7da (JavaDoc improvement) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/c30c6996 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/c30c6996 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/c30c6996 Branch: refs/heads/2.3-gae Commit: c30c699635b830f7bd5c4a5523242641d454830a Parents: 387dcd4 Author: ddekany Authored: Sun Jul 2 19:11:20 2017 +0200 Committer: ddekany Committed: Sun Jul 2 19:11:20 2017 +0200 ---------------------------------------------------------------------- src/main/java/freemarker/core/Configurable.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c30c6996/src/main/java/freemarker/core/Configurable.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/Configurable.java b/src/main/java/freemarker/core/Configurable.java index 9084956..4887dfe 100644 --- a/src/main/java/freemarker/core/Configurable.java +++ b/src/main/java/freemarker/core/Configurable.java @@ -1324,12 +1324,8 @@ public class Configurable { * output, or if you want to suppress certain exceptions. If you suppress an exception, and the * {@link Environment#getLogTemplateExceptions()} returns {@code false}, then it's the responsibility of the * {@link TemplateExceptionHandler} to log the exception (if you want it to be logged). - * - *

The {@link #setLogTemplateExceptions(boolean) log_template_exceptions} and - * {@link #setAttemptExceptionReporter(AttemptExceptionReporter) attempt_exception_reporter} settings take effect - * before the {@link TemplateExceptionHandler} is invoked, so these settings are technically independent, and deal - * with different aspects of exception handling. * + * @see #setLogTemplateExceptions(boolean) * @see #setAttemptExceptionReporter(AttemptExceptionReporter) */ public void setTemplateExceptionHandler(TemplateExceptionHandler templateExceptionHandler) { @@ -1366,6 +1362,8 @@ public class Configurable { * *

The {@link AttemptExceptionReporter} is invoked regardless of the value of the * {@link #setLogTemplateExceptions(boolean) log_template_exceptions} setting. + * The {@link AttemptExceptionReporter} is not invoked if the {@link TemplateExceptionHandler} has suppressed the + * exception. * * @since 2.3.27 */