Repository: incubator-freemarker Updated Branches: refs/heads/3 088cef636 -> fd1cc7a75
Forward ported from 2.3-gae: Added a missing cause exception to .getOptionalTemplate Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/fd1cc7a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/fd1cc7a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/fd1cc7a7 Branch: refs/heads/3 Commit: fd1cc7a75a382db904535ea6fa1129b557bf10e8 Parents: 088cef6 Author: ddekany <[email protected]> Authored: Mon Mar 26 22:39:18 2018 +0200 Committer: ddekany <[email protected]> Committed: Mon Mar 26 22:39:18 2018 +0200 ---------------------------------------------------------------------- .../org/apache/freemarker/core/GetOptionalTemplateFunction.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/fd1cc7a7/freemarker-core/src/main/java/org/apache/freemarker/core/GetOptionalTemplateFunction.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/GetOptionalTemplateFunction.java b/freemarker-core/src/main/java/org/apache/freemarker/core/GetOptionalTemplateFunction.java index eb8b6da..57d5746 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/GetOptionalTemplateFunction.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/GetOptionalTemplateFunction.java @@ -62,7 +62,8 @@ class GetOptionalTemplateFunction implements TemplateFunctionModel { template = env.getTemplateForInclusion(absTemplateName, true); } catch (IOException e) { throw new TemplateException( - "Error when trying to include template ", new _DelayedJQuote(absTemplateName)); + e, "Error when trying to include template ", new _DelayedJQuote(absTemplateName), + "; see cause exception"); } NativeHashEx result = new NativeHashEx();
