Repository: freemarker Updated Branches: refs/heads/2.3-gae c97fffb8b -> e8ef99377
(Some comment typos and minor code cleanup) Project: http://git-wip-us.apache.org/repos/asf/freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/freemarker/commit/764007c3 Tree: http://git-wip-us.apache.org/repos/asf/freemarker/tree/764007c3 Diff: http://git-wip-us.apache.org/repos/asf/freemarker/diff/764007c3 Branch: refs/heads/2.3-gae Commit: 764007c3595b22f7d81fcb79a856a4a3851a997b Parents: c97fffb Author: ddekany <ddek...@apache.org> Authored: Wed Sep 12 00:02:11 2018 +0200 Committer: ddekany <ddek...@apache.org> Committed: Wed Sep 12 00:02:11 2018 +0200 ---------------------------------------------------------------------- src/main/java/freemarker/core/AddConcatExpression.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/freemarker/blob/764007c3/src/main/java/freemarker/core/AddConcatExpression.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/AddConcatExpression.java b/src/main/java/freemarker/core/AddConcatExpression.java index f7e53ca..c337296 100644 --- a/src/main/java/freemarker/core/AddConcatExpression.java +++ b/src/main/java/freemarker/core/AddConcatExpression.java @@ -275,14 +275,14 @@ final class AddConcatExpression extends Expression { } } - private static void addKeys(Set set, SimpleSequence keySeq, TemplateHashModelEx hash) + private static void addKeys(Set keySet, SimpleSequence keySeq, TemplateHashModelEx hash) throws TemplateModelException { TemplateModelIterator it = hash.keys().iterator(); while (it.hasNext()) { TemplateScalarModel tsm = (TemplateScalarModel) it.next(); - if (set.add(tsm.getAsString())) { - // The first occurence of the key decides the index; - // this is consisten with stuff like java.util.LinkedHashSet. + if (keySet.add(tsm.getAsString())) { + // The first occurrence of the key decides the index; + // this is consistent with the behavior of java.util.LinkedHashSet. keySeq.add(tsm); } }
