(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 Commit: c30c699635b830f7bd5c4a5523242641d454830a Parents: 387dcd4 Author: ddekany <ddek...@apache.org> Authored: Sun Jul 2 19:11:20 2017 +0200 Committer: ddekany <ddek...@apache.org> 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). - * - * <p>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 { * * <p>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 */
