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 CD281200B40 for ; Fri, 1 Jul 2016 17:06:27 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CBAC5160A61; Fri, 1 Jul 2016 15:06:27 +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 1F348160A4D for ; Fri, 1 Jul 2016 17:06:26 +0200 (CEST) Received: (qmail 5689 invoked by uid 500); 1 Jul 2016 15:06:26 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 5676 invoked by uid 99); 1 Jul 2016 15:06:26 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jul 2016 15:06:26 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id E6C1AC70CC for ; Fri, 1 Jul 2016 15:06:25 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.287 X-Spam-Level: X-Spam-Status: No, score=-0.287 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.287] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id NpjKOggijjQB for ; Fri, 1 Jul 2016 15:06:25 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 496175F201 for ; Fri, 1 Jul 2016 15:06:25 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 82AD4E0098 for ; Fri, 1 Jul 2016 15:06:24 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 8162C3A019C for ; Fri, 1 Jul 2016 15:06:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1750958 - /sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java Date: Fri, 01 Jul 2016 15:06:24 -0000 To: commits@sling.apache.org From: olli@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160701150624.8162C3A019C@svn01-us-west.apache.org> archived-at: Fri, 01 Jul 2016 15:06:28 -0000 Author: olli Date: Fri Jul 1 15:06:24 2016 New Revision: 1750958 URL: http://svn.apache.org/viewvc?rev=1750958&view=rev Log: SLING-5075 Upgrade Thymeleaf to 3.0 add null check for configuration Modified: sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java Modified: sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java?rev=1750958&r1=1750957&r2=1750958&view=diff ============================================================================== --- sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java (original) +++ sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java Fri Jul 1 15:06:24 2016 @@ -334,6 +334,10 @@ public final class ThymeleafScriptEngine private void setupTemplateEngine() { logger.info("setting up new template engine"); templateEngine = null; + if (configuration == null) { + logger.info("configuration is null, not setting up new template engine"); + return; + } // setup template engine final TemplateEngine templateEngine = new TemplateEngine(); // Template Resolvers