You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/03/12 17:18:16 UTC
incubator-freemarker git commit: (Fixed auto-import and auto-includes
merging... though in practice this bug had no effect.)
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae 0c518cd15 -> 78793b25a
(Fixed auto-import and auto-includes merging... though in practice this bug had no effect.)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/78793b25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/78793b25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/78793b25
Branch: refs/heads/2.3-gae
Commit: 78793b25a1d901004fa68d9286fd353d797ca288
Parents: 0c518cd
Author: ddekany <dd...@apache.org>
Authored: Sun Mar 12 18:18:11 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Mar 12 18:18:11 2017 +0100
----------------------------------------------------------------------
src/main/java/freemarker/core/TemplateConfiguration.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/78793b25/src/main/java/freemarker/core/TemplateConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateConfiguration.java b/src/main/java/freemarker/core/TemplateConfiguration.java
index ea9e3a3..e79bcab 100644
--- a/src/main/java/freemarker/core/TemplateConfiguration.java
+++ b/src/main/java/freemarker/core/TemplateConfiguration.java
@@ -256,10 +256,10 @@ public final class TemplateConfiguration extends Configurable implements ParserC
setLazyAutoImports(tc.getLazyAutoImports());
}
if (tc.isAutoImportsSet()) {
- setAutoImports(mergeMaps(getAutoImports(), tc.getAutoImports(), true));
+ setAutoImports(mergeMaps(getAutoImportsWithoutFallback(), tc.getAutoImportsWithoutFallback(), true));
}
if (tc.isAutoIncludesSet()) {
- setAutoIncludes(mergeLists(getAutoIncludes(), tc.getAutoIncludes()));
+ setAutoIncludes(mergeLists(getAutoIncludesWithoutFallback(), tc.getAutoIncludesWithoutFallback()));
}
tc.copyDirectCustomAttributes(this, true);