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:44 UTC
incubator-freemarker git commit: (Forward ported from 2.3-gae: Fixed
auto-import and auto-includes merging... though in practice this bug had no
effect.)
Repository: incubator-freemarker
Updated Branches:
refs/heads/3 c6f83ebf6 -> 88827c24d
(Forward ported from 2.3-gae: 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/88827c24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/88827c24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/88827c24
Branch: refs/heads/3
Commit: 88827c24d333ed0a59687183d3099aad4ba57701
Parents: c6f83eb
Author: ddekany <dd...@apache.org>
Authored: Sun Mar 12 18:18:40 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Mar 12 18:18:40 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/freemarker/core/TemplateConfiguration.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/88827c24/src/main/java/org/apache/freemarker/core/TemplateConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/TemplateConfiguration.java b/src/main/java/org/apache/freemarker/core/TemplateConfiguration.java
index 8997ea1..28023ea 100644
--- a/src/main/java/org/apache/freemarker/core/TemplateConfiguration.java
+++ b/src/main/java/org/apache/freemarker/core/TemplateConfiguration.java
@@ -249,10 +249,10 @@ public final class TemplateConfiguration extends Configurable implements ParserC
setLazyAutoImports(tc.getLazyAutoImports());
}
if (tc.isAutoImportsSet()) {
- setAutoImports(mergeMaps(isAutoImportsSet() ? getAutoImports() : null, tc.getAutoImports(), true));
+ setAutoImports(mergeMaps(getAutoImportsWithoutFallback(), tc.getAutoImportsWithoutFallback(),true));
}
if (tc.isAutoIncludesSet()) {
- setAutoIncludes(mergeLists(isAutoIncludesSet() ? getAutoIncludes() : null, tc.getAutoIncludes()));
+ setAutoIncludes(mergeLists(getAutoIncludesWithoutFallback(), tc.getAutoIncludesWithoutFallback()));
}
tc.copyDirectCustomAttributes(this, true);