Merge pull request #13714 from codeconsole/trigger-sitemesh

Fix for sitemesh. Buffering is triggered on response.setContentType so rendering needs to be done on wrapped response.
grails · Oct 1, 2024 · 060c935 · 060c935
2 parents 456c989 + 06c250f
commit 060c935
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/grails-web-common/src/main/groovy/org/grails/web/servlet/view/AbstractGrailsView.java b/grails-web-common/src/main/groovy/org/grails/web/servlet/view/AbstractGrailsView.java
@@ -24,6 +24,7 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
+import org.grails.web.servlet.WrappedResponseHolder;
 import org.grails.web.util.GrailsApplicationAttributes;
 import org.grails.web.servlet.mvc.GrailsWebRequest;
 import org.grails.web.util.WebUtils;
@@ -68,6 +69,8 @@ private void renderWithinGrailsWebRequest(Map<String, Object> model, HttpServlet
             } else {
                 webRequest = (GrailsWebRequest)requestAttributes;
             }
+            // Update response holder to latest response. Necessary for sitemesh to trigger buffering.
+            WrappedResponseHolder.setWrappedResponse(response);
             renderTemplate(model, webRequest, request, response);
         } finally {
             if(attributesChanged) {