sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o...@apache.org
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 GMT
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



Mime
View raw message