This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch issue/SLING-13103 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-core.git
commit 3b69f22e12a63f0f71952fd247fafef2bc6ba361 Author: Robert Munteanu <[email protected]> AuthorDate: Tue Feb 10 11:06:33 2026 +0100 SLING-13103 - Wrong ResourceResolver set in script bindings after request dispatch in a Jakarta Context Use the resource resolver from the resource, not the one from the request. --- .../org/apache/sling/scripting/core/impl/DefaultSlingScript.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java b/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java index 9fcf9c3..cf66a03 100644 --- a/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java +++ b/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java @@ -659,10 +659,11 @@ class DefaultSlingScript implements SlingScript, Servlet, ServletConfig { throw fail(RESOURCE, "Not the same as resource of the SlingScriptHelper request"); } - if (resolverObject != null && sling.getJakartaRequest().getResourceResolver() != resolverObject) { + if (resolverObject != null + && sling.getJakartaRequest().getResource().getResourceResolver() != resolverObject) { throw fail( RESOLVER, - "Not the same as the resource resolver of the SlingScriptHelper request's resolver"); + "Not the same as the resource resolver of the SlingScriptHelper request's resource"); } if (writerObject != null && sling.getJakartaResponse().getWriter() != writerObject) { @@ -677,7 +678,7 @@ class DefaultSlingScript implements SlingScript, Servlet, ServletConfig { bindings.put(RESPONSE, sling.getResponse()); bindings.put(READER, sling.getJakartaRequest().getReader()); bindings.put(RESOURCE, sling.getJakartaRequest().getResource()); - bindings.put(RESOLVER, sling.getJakartaRequest().getResourceResolver()); + bindings.put(RESOLVER, sling.getJakartaRequest().getResource().getResourceResolver()); bindings.put(OUT, sling.getJakartaResponse().getWriter()); }
