[sling-org-apache-sling-scripting-thymeleaf] 47/50: SLING-5075 Upgrade Thymeleaf to 3.0

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.scripting.thymeleaf-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-thymeleaf.git

commit 2cc0572b71cbe0868eacc488daa764f178ce4b57
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Jul 1 15:06:24 2016 +0000

    SLING-5075 Upgrade Thymeleaf to 3.0
    
    add null check for configuration
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf@1750958 13f79535-47bb-0310-9956-ffa450edef68
---
 .../scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java b/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java
index e0ae7d9..f475925 100644
--- a/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java
+++ b/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java
@@ -334,6 +334,10 @@ public final class ThymeleafScriptEngineFactory extends AbstractScriptEngineFact
     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

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.