[sling-org-apache-sling-scripting-thymeleaf] 41/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 1e9f701e1371f218c1c4d20186272b2c8b1f1d0d
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Jun 17 11:59:56 2016 +0000

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

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 6d7d228..3ac5358 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
@@ -383,7 +383,7 @@ public final class ThymeleafScriptEngineFactory extends AbstractScriptEngineFact
     }
 
     private void registerTemplateEngine() {
-        if (templateEngine.getTemplateResolvers().size() == 0 || templateEngine.getMessageResolvers().size() == 0 || templateEngine.getDialects().size() == 0) {
+        if (templateEngine == null || templateEngine.getTemplateResolvers().size() == 0 || templateEngine.getMessageResolvers().size() == 0 || templateEngine.getDialects().size() == 0) {
             return;
         }
         final Dictionary<String, String> properties = new Hashtable<>();

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