(sling-org-apache-sling-servlets-resolver) 16/28: SLING-13016 - RequestWrapper causes NPEs when serving bundled scripts if 'forceResourceType' is not set (#61)

[jsedding]

This is an automated email from the ASF dual-hosted git repository.

jsedding pushed a commit to branch resolver-2.x-backports
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git

commit ab24eae336d1c020de4a852c3151eee0bdc4d3d4
Author: Robert Munteanu <romb...@apache.org>
AuthorDate: Fri Nov 28 16:12:45 2025 +0100

    SLING-13016 - RequestWrapper causes NPEs when serving bundled scripts if 
'forceResourceType' is not set (#61)
    
    Add back the null check.
    
    (cherry picked from commit 01da40a47c698659e5f6cbdf20b69f359f8a1b2f)
---
 .../sling/servlets/resolver/internal/bundle/RequestWrapper.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/RequestWrapper.java
 
b/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/RequestWrapper.java
index c7fa57e..3021c49 100644
--- 
a/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/RequestWrapper.java
+++ 
b/src/main/java/org/apache/sling/servlets/resolver/internal/bundle/RequestWrapper.java
@@ -42,7 +42,9 @@ public class RequestWrapper extends 
SlingHttpServletRequestWrapper {
         if (resource == null) {
             return null;
         }
-        if (options != null && options.getForceResourceType().isEmpty()) {
+        if (options != null
+                && (options.getForceResourceType() == null
+                        || options.getForceResourceType().isEmpty())) {
             options.setForceResourceType(resource.getResourceType());
         }
         RequestDispatcherOptions processedOptions = processOptions(options);