Repository: incubator-freemarker Updated Branches: refs/heads/3 3f77b8f76 -> 863a9d98c
(Missing changes from the last commit...) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/863a9d98 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/863a9d98 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/863a9d98 Branch: refs/heads/3 Commit: 863a9d98ca7e64524ffc594900e89e7ba2e9b82f Parents: 3f77b8f Author: ddekany <[email protected]> Authored: Thu Apr 6 14:37:18 2017 +0200 Committer: ddekany <[email protected]> Committed: Thu Apr 6 14:37:18 2017 +0200 ---------------------------------------------------------------------- src/main/java/org/apache/freemarker/core/Template.java | 2 +- src/main/javacc/FTL.jj | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/863a9d98/src/main/java/org/apache/freemarker/core/Template.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/Template.java b/src/main/java/org/apache/freemarker/core/Template.java index 38cf7f4..5e58508 100644 --- a/src/main/java/org/apache/freemarker/core/Template.java +++ b/src/main/java/org/apache/freemarker/core/Template.java @@ -316,7 +316,7 @@ public class Template extends MutableProcessingConfiguration<Template> implement * * @param sourceEncoding The charset used to decode the template content to the {@link String} passed in with the * {@code content} parameter. If that information is not known or irrelevant, this should be - * {@link null}. + * {@code null}. * * @since 2.3.22 */ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/863a9d98/src/main/javacc/FTL.jj ---------------------------------------------------------------------- diff --git a/src/main/javacc/FTL.jj b/src/main/javacc/FTL.jj index ee3ac75..a7bbc2a 100644 --- a/src/main/javacc/FTL.jj +++ b/src/main/javacc/FTL.jj @@ -3904,9 +3904,9 @@ void HeaderElement() : throw new ParseException("Failed to resolve charset name: " + vs, exp, e .getCause()); } - if (template.getSourceEncoding() != null - && !template.getSourceEncoding().equals(encoding)) { - throw new WrongTemplateCharsetException(encoding, template.getSourceEncoding()); + if (template.getActualSourceEncoding() != null + && !template.getActualSourceEncoding().equals(encoding)) { + throw new WrongTemplateCharsetException(encoding, template.getActualSourceEncoding()); } // There will be no WrongTemplateCharsetException exception, release mark buffer: if (streamToUnmarkWhenEncEstabd != null) {
