Repository: incubator-freemarker Updated Branches: refs/heads/3 a0019cfc6 -> b13c1c768
(Added TODO FM3 comment) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/23bfeca2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/23bfeca2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/23bfeca2 Branch: refs/heads/3 Commit: 23bfeca2d4a464593c28b8aadf8d1ec43119d821 Parents: a0019cf Author: ddekany <ddek...@apache.org> Authored: Thu Mar 1 09:53:00 2018 +0100 Committer: ddekany <ddek...@apache.org> Committed: Thu Mar 1 09:53:00 2018 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/freemarker/core/Environment.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/23bfeca2/freemarker-core/src/main/java/org/apache/freemarker/core/Environment.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/Environment.java b/freemarker-core/src/main/java/org/apache/freemarker/core/Environment.java index ad6b79b..4288197 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/Environment.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/Environment.java @@ -2572,6 +2572,7 @@ public final class Environment extends MutableProcessingConfiguration<Environmen final boolean lazyImport; if (loadedTemplate != null) { lazyImport = false; + // TODO [FM3] // As we have an already normalized name, we use it. 2.3.x note: We should use the template.sourceName as // namespace key, but historically we use the looked up name (template.name); check what lazy import does if // that will be fixed, as that can't do the template lookup, yet the keys must be the same.