From notifications-return-5846-archive-asf-public=cust-asf.ponee.io@freemarker.apache.org Thu Jan 17 11:00:46 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 0052D18077B for ; Thu, 17 Jan 2019 11:00:45 +0100 (CET) Received: (qmail 58401 invoked by uid 500); 17 Jan 2019 10:00:45 -0000 Mailing-List: contact notifications-help@freemarker.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.apache.org Delivered-To: mailing list notifications@freemarker.apache.org Received: (qmail 58309 invoked by uid 99); 17 Jan 2019 10:00:45 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jan 2019 10:00:45 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 45A46873A6; Thu, 17 Jan 2019 10:00:44 +0000 (UTC) Date: Thu, 17 Jan 2019 10:00:48 +0000 To: "notifications@freemarker.apache.org" Subject: [freemarker] 04/04: To investigate odd cinit NPE occurring on Travis MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: ddekany@apache.org In-Reply-To: <154771924409.28030.6050872660938840905@gitbox.apache.org> References: <154771924409.28030.6050872660938840905@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: freemarker X-Git-Refname: refs/heads/3 X-Git-Reftype: branch X-Git-Rev: 86ca4d31eeb5d8f9c210d1d4c9b0377e37d0e87b X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190117100044.45A46873A6@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 3 in repository https://gitbox.apache.org/repos/asf/freemarker.git commit 86ca4d31eeb5d8f9c210d1d4c9b0377e37d0e87b Author: ddekany AuthorDate: Thu Jan 17 10:58:45 2019 +0100 To investigate odd cinit NPE occurring on Travis --- .../src/main/java/org/apache/freemarker/core/Configuration.java | 8 +++++++- .../apache/freemarker/core/UnsupportedFM2TemplateLanguage.java | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/Configuration.java b/freemarker-core/src/main/java/org/apache/freemarker/core/Configuration.java index 03a8a55..5f57c26 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/Configuration.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/Configuration.java @@ -792,9 +792,15 @@ public final class Configuration implements TopLevelConfiguration, CustomStateSc PREDEFINED_TEMPLATE_LANGUAGES_BY_EXTENSION = new HashMap(32); for (TemplateLanguage tl : DefaultTemplateLanguage.STANDARD_INSTANCES) { - PREDEFINED_TEMPLATE_LANGUAGES_BY_EXTENSION.put(tl.getFileExtension(), tl); + if (tl == null) { + throw new AssertionError("tl was null"); + } + PREDEFINED_TEMPLATE_LANGUAGES_BY_EXTENSION.put(tl.getFileExtension(), tl); } for (TemplateLanguage tl : UnsupportedFM2TemplateLanguage.INSTANCES) { + if (tl == null) { + throw new AssertionError("tl was null"); + } PREDEFINED_TEMPLATE_LANGUAGES_BY_EXTENSION.put(tl.getFileExtension(), tl); } PREDEFINED_TEMPLATE_LANGUAGES_BY_EXTENSION.put( diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/UnsupportedFM2TemplateLanguage.java b/freemarker-core/src/main/java/org/apache/freemarker/core/UnsupportedFM2TemplateLanguage.java index e67091d..073d4e6 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/UnsupportedFM2TemplateLanguage.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/UnsupportedFM2TemplateLanguage.java @@ -24,6 +24,7 @@ import java.io.InputStream; import java.io.Reader; import org.apache.freemarker.core.outputformat.OutputFormat; +import org.apache.freemarker.core.util._NullArgumentException; /** * FreeMarker 2 template language, which we don't support. To avoid confusion we ban loading such templates. @@ -37,7 +38,12 @@ class UnsupportedFM2TemplateLanguage extends TemplateLanguage { private static final UnsupportedFM2TemplateLanguage FTLX = new UnsupportedFM2TemplateLanguage( "ftlx", null, AutoEscapingPolicy.ENABLE_IF_DEFAULT); - static final UnsupportedFM2TemplateLanguage[] INSTANCES = new UnsupportedFM2TemplateLanguage[] { FTL, FTLH, FTLX }; + static final UnsupportedFM2TemplateLanguage[] INSTANCES = + new UnsupportedFM2TemplateLanguage[] { + _NullArgumentException.check(FTL), + _NullArgumentException.check(FTLH), + _NullArgumentException.check(FTLX) + }; private UnsupportedFM2TemplateLanguage(String fileExtension, OutputFormat outputFormat, AutoEscapingPolicy autoEscapingPolicy) {