[sling-org-apache-sling-scripting-thymeleaf] 31/39: do not resolve template when resource is null

[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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-thymeleaf.git

commit a9c482286ca61c40a862c9fe5f28e8286ce00f7d
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Feb 7 23:35:43 2017 +0000

    do not resolve template when resource is null
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf@1782090 13f79535-47bb-0310-9956-ffa450edef68
---
 .../scripting/thymeleaf/internal/SlingResourceTemplateResolver.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java b/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java
index f28087b..bc40258 100644
--- a/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java
+++ b/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java
@@ -115,6 +115,10 @@ public class SlingResourceTemplateResolver implements ITemplateResolver {
             final SlingContext slingContext = (SlingContext) context;
             final ResourceResolver resourceResolver = slingContext.getResourceResolver();
             final Resource resource = resourceResolver.getResource(template);
+            if (resource == null) {
+                logger.warn("resource for template '{}' is null, not resolving template", template);
+                return null;
+            }
             final ITemplateResource templateResource = new SlingTemplateResource(resource);
             final boolean templateResourceExistenceVerified = false;
             final TemplateMode templateMode = templateModeProvider.provideTemplateMode(resource);

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