Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 23AC2200C35 for ; Sun, 12 Mar 2017 18:18:21 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 22432160B77; Sun, 12 Mar 2017 17:18:21 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6C157160B69 for ; Sun, 12 Mar 2017 18:18:20 +0100 (CET) Received: (qmail 4581 invoked by uid 500); 12 Mar 2017 17:18:19 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 4572 invoked by uid 99); 12 Mar 2017 17:18:19 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 12 Mar 2017 17:18:19 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 117D0C0096 for ; Sun, 12 Mar 2017 17:18:19 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.569 X-Spam-Level: X-Spam-Status: No, score=-3.569 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_NEUTRAL=0.652] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id wlDwnUPTZqfY for ; Sun, 12 Mar 2017 17:18:18 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 4E94D5F2EF for ; Sun, 12 Mar 2017 17:18:17 +0000 (UTC) Received: (qmail 4569 invoked by uid 99); 12 Mar 2017 17:18:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 12 Mar 2017 17:18:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5784EDFDC8; Sun, 12 Mar 2017 17:18:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-freemarker git commit: (Fixed auto-import and auto-includes merging... though in practice this bug had no effect.) Date: Sun, 12 Mar 2017 17:18:16 +0000 (UTC) archived-at: Sun, 12 Mar 2017 17:18:21 -0000 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 Authored: Sun Mar 12 18:18:11 2017 +0100 Committer: ddekany 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);