[sling-org-apache-sling-scripting-sightly-js-provider] branch master updated: SLING-9599 - Incomplete non-existing resource check

[radu]

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

radu pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-js-provider.git


The following commit(s) were added to refs/heads/master by this push:
     new 63295f1  SLING-9599 - Incomplete non-existing resource check
63295f1 is described below

commit 63295f1305c3b168998380c7a4fc66eb5eec0710
Author: Radu Cotescu <r...@apache.org>
AuthorDate: Wed Jul 22 16:14:19 2020 +0200

    SLING-9599 - Incomplete non-existing resource check
    
    * search for base servlet resource with or without mounted
    servlted providers
---
 pom.xml                                              |  2 +-
 .../sightly/js/impl/use/DependencyResolver.java      | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5675fd4..4308314 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
     <!-- P R O J E C T                                                         
  -->
     <!-- 
======================================================================= -->
     <artifactId>org.apache.sling.scripting.sightly.js.provider</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
 
     <name>Apache Sling Scripting HTL JS Use Provider</name>
 
diff --git 
a/src/main/java/org/apache/sling/scripting/sightly/js/impl/use/DependencyResolver.java
 
b/src/main/java/org/apache/sling/scripting/sightly/js/impl/use/DependencyResolver.java
index 6e2f577..b6af89c 100644
--- 
a/src/main/java/org/apache/sling/scripting/sightly/js/impl/use/DependencyResolver.java
+++ 
b/src/main/java/org/apache/sling/scripting/sightly/js/impl/use/DependencyResolver.java
@@ -96,17 +96,13 @@ public class DependencyResolver {
                     if (!type.startsWith("/")) {
                         for (String searchPath : 
scriptingResourceResolver.getSearchPath()) {
                             String normalizedPath = 
ResourceUtil.normalize(searchPath + "/" + type);
-                            if (normalizedPath != null) {
-                                servletResource =
-                                        
scriptingResourceResolver.resolve(normalizedPath);
-                                if (!(servletResource instanceof 
NonExistingResource) &&
-                                        
!Resource.RESOURCE_TYPE_NON_EXISTING.equalsIgnoreCase(servletResource.getResourceType()))
 {
-                                    break;
-                                }
+                            servletResource = 
resolveServletResource(normalizedPath);
+                            if (servletResource != null) {
+                                break;
                             }
                         }
                     } else {
-                        servletResource = 
scriptingResourceResolver.resolve(type);
+                        servletResource = resolveServletResource(type);
                     }
                     if (servletResource != null) {
                         if (dependency.startsWith(".")) {
@@ -139,4 +135,12 @@ public class DependencyResolver {
         return reader;
     }
 
+    Resource resolveServletResource(String type) {
+        Resource servletResource = scriptingResourceResolver.resolve(type);
+        if (ResourceUtil.isNonExistingResource(servletResource)) {
+            servletResource = scriptingResourceResolver.getResource(type);
+        }
+        return servletResource;
+    }
+
 }