commit 901b492461c0aa7b06b561772fa43dac3605e477
author Radu Cotescu <radu@apache.org> Wed Aug 19 16:02:39 2020 +0200
committer Radu Cotescu <radu@apache.org> Wed Aug 19 16:02:39 2020 +0200
tree c26eb6d910d798427f732cc2b55ee7b7c56ef1fb
parent 5b317743a44fedf92817183497c99ca08ffc2519

SLING-9657 - Same-name JS Use dependencies are not always correctly resolved

* work correctly with servlet resources

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 4b62069..2a916e8 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
@@ -151,12 +151,12 @@
         Resource caller = null;
         String callerName = (String) bindings.get(ScriptEngine.FILENAME);
         if (StringUtils.isNotEmpty(callerName)) {
-            caller = scriptingResourceResolver.getResource(callerName);
+            caller = resolveResource(callerName);
         }
         if (caller == null) {
             SlingScriptHelper scriptHelper = Utils.getHelper(bindings);
             if (scriptHelper != null) {
-                caller = scriptingResourceResolver.getResource(scriptHelper.getScript().getScriptResource().getPath());
+                caller = resolveResource(scriptHelper.getScript().getScriptResource().getPath());
             }
         }
         return caller;