You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2022/08/03 10:09:28 UTC
[sling-org-apache-sling-scripting-sightly-js-provider] 01/01: SLING-11508 - Make dependency resolution use ResourceResolver#getResource instead of ResourceResolver#resolve
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch issue/SLING-11508
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-js-provider.git
commit f8809bd3810d5835cd4d63adcbe34b9308588406
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Jun 21 11:02:08 2022 +0200
SLING-11508 - Make dependency resolution use ResourceResolver#getResource instead of ResourceResolver#resolve
* switched from resolve to getResource
---
.../scripting/sightly/js/impl/use/DependencyResolver.java | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
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 @@ public class DependencyResolver {
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;
}