Repository: incubator-freemarker Updated Branches: refs/heads/3 fd1cc7a75 -> 4039577ae
Forward ported from 2.3-gae: Adjusted getOptionalTemplate error message yet again. Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/4039577a Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/4039577a Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/4039577a Branch: refs/heads/3 Commit: 4039577aeec507971ebcf3f8b5bdf0caa692e7b2 Parents: fd1cc7a Author: ddekany <[email protected]> Authored: Tue Mar 27 10:16:33 2018 +0200 Committer: ddekany <[email protected]> Committed: Tue Mar 27 10:16:33 2018 +0200 ---------------------------------------------------------------------- .../org/apache/freemarker/core/GetOptionalTemplateFunction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4039577a/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 57d5746..e8c32cf 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,7 @@ class GetOptionalTemplateFunction implements TemplateFunctionModel { template = env.getTemplateForInclusion(absTemplateName, true); } catch (IOException e) { throw new TemplateException( - e, "Error when trying to include template ", new _DelayedJQuote(absTemplateName), + e, "I/O error when trying to load optional template ", new _DelayedJQuote(absTemplateName), "; see cause exception"); }
