commit e708be2e2693f743f39e695ac2cc60eb5cef6b93
author Radu Cotescu <radu@apache.org> Tue Aug 13 18:43:20 2019 +0200
committer Karl Pauls <pauls@apache.org> Tue May 12 12:30:33 2020 +0200
tree 081f6c7ba14c62f61602be715f1a6d9a172cf574
parent 01390f610b6e54485284efa27d2b6122b8678acd

corrected behaviour for dispatching servlet

main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java

diff --git a/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java b/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
index 5e70600..6a06ec3 100644
--- a/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
@@ -43,6 +43,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.sling.api.SlingConstants;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.SlingHttpServletResponse;
 import org.apache.sling.api.request.RequestDispatcherOptions;
@@ -382,7 +383,16 @@
 
                 RequestDispatcher dispatcher = slingRequest.getRequestDispatcher(slingRequest.getResource(), options);
                 if (dispatcher != null) {
-                    dispatcher.forward(req, res);
+                    if (slingRequest.getAttribute(SlingConstants.ATTR_INCLUDE_SERVLET_PATH) == null) {
+                        final String contentType = slingRequest.getResponseContentType();
+                        if (contentType != null) {
+                            res.setContentType(contentType);
+                            if (contentType.startsWith("text/")) {
+                                res.setCharacterEncoding("UTF-8");
+                            }
+                        }
+                    }
+                    dispatcher.include(req, res);
                 } else {
                     ((SlingHttpServletResponse) res).sendError(HttpServletResponse.SC_NOT_FOUND);
                 }