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 14:42:08 UTC
[sling-org-apache-sling-scripting-sightly-js-provider] branch master updated: 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 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 aaa1f7d SLING-11508 - Make dependency resolution use ResourceResolver#getResource instead of ResourceResolver#resolve
aaa1f7d is described below
commit aaa1f7db33f887d40bf5f425f98793fc535c0550
Author: Radu Cotescu <17...@users.noreply.github.com>
AuthorDate: Wed Aug 3 16:42:04 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;
}