commit aaa1f7db33f887d40bf5f425f98793fc535c0550
author Radu Cotescu <170911+raducotescu@users.noreply.github.com> Wed Aug 03 16:42:04 2022 +0200
committer GitHub <noreply@github.com> Wed Aug 03 16:42:04 2022 +0200
tree f773909eba8f83fcfd7609880e2e93b60eaaefb7
parent bbc48a2e7b3efb5a798053e6b9d0fe1ff50ab5f1

SLING-11508 - Make dependency resolution use ResourceResolver#getResource instead of ResourceResolver#resolve

* switched from resolve to getResource

src/main/java/org/apache/sling/scripting/sightly/js/impl/use/DependencyResolver.java

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 b150c1e..f4c2fc8 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
@@ -126,18 +126,12 @@
     private Resource resolveResource(String type) {
         Resource servletResource = null;
         if (type.startsWith("/")) {
-            servletResource = scriptingResourceResolver.resolve(type);
-            if (ResourceUtil.isNonExistingResource(servletResource)) {
-                servletResource = scriptingResourceResolver.getResource(type);
-            }
+            servletResource = scriptingResourceResolver.getResource(type);
         } else {
             for (String searchPath : scriptingResourceResolver.getSearchPath()) {
-                String absolutePath = ResourceUtil.normalize(searchPath + "/" + type);
+                String absolutePath = ResourceUtil.normalize(searchPath + type);
                 if (absolutePath != null) {
-                    servletResource = scriptingResourceResolver.resolve(absolutePath);
-                    if (ResourceUtil.isNonExistingResource(servletResource)) {
-                        servletResource = scriptingResourceResolver.getResource(type);
-                    }
+                    servletResource = scriptingResourceResolver.getResource(absolutePath);
                     if (servletResource != null) {
                         return servletResource;
                     }