Fixed template interruption support incompatibility with wrapUncheckedExceptions=true.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/09a253af Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/09a253af Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/09a253af Branch: refs/heads/2.3 Commit: 09a253af30bb37c404998b93bd90360e6f8b3b75 Parents: 6863029 Author: ddekany <ddek...@apache.org> Authored: Thu Sep 28 02:25:36 2017 +0200 Committer: ddekany <ddek...@apache.org> Committed: Thu Sep 28 02:25:36 2017 +0200 ---------------------------------------------------------------------- src/main/java/freemarker/core/FlowControlException.java | 10 +++++++++- .../ThreadInterruptionSupportTemplatePostProcessor.java | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/09a253af/src/main/java/freemarker/core/FlowControlException.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/FlowControlException.java b/src/main/java/freemarker/core/FlowControlException.java index 7865dc5..8de6331 100644 --- a/src/main/java/freemarker/core/FlowControlException.java +++ b/src/main/java/freemarker/core/FlowControlException.java @@ -5,5 +5,13 @@ package freemarker.core; */ @SuppressWarnings("serial") class FlowControlException extends RuntimeException { - // + + FlowControlException() { + super(); + } + + FlowControlException(String message) { + super(message); + } + } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/09a253af/src/main/java/freemarker/core/ThreadInterruptionSupportTemplatePostProcessor.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/ThreadInterruptionSupportTemplatePostProcessor.java b/src/main/java/freemarker/core/ThreadInterruptionSupportTemplatePostProcessor.java index 84807cc..3f3ab96 100644 --- a/src/main/java/freemarker/core/ThreadInterruptionSupportTemplatePostProcessor.java +++ b/src/main/java/freemarker/core/ThreadInterruptionSupportTemplatePostProcessor.java @@ -130,7 +130,7 @@ class ThreadInterruptionSupportTemplatePostProcessor extends TemplatePostProcess * <p>ATTENTION: This is used by https://github.com/kenshoo/freemarker-online. Don't break backward * compatibility without updating that project too! */ - static class TemplateProcessingThreadInterruptedException extends RuntimeException { + static class TemplateProcessingThreadInterruptedException extends FlowControlException { TemplateProcessingThreadInterruptedException() { super("Template processing thread \"interrupted\" flag was set.");
