Fix for #9362 - Restore Servlet 2.5 support

Author: graemerocher

grails-web-common/src/main/groovy/org/codehaus/groovy/grails/web/servlet/view/AbstractGrailsView.java

@@ -40,7 +40,7 @@ private void renderWithinGrailsWebRequest(Map<String, Object> model, HttpServlet
         try {
             GrailsWebRequest webRequest;
             if(!(requestAttributes instanceof GrailsWebRequest)) {
-                webRequest = createGrailsWebRequest(request, response, request.getServletContext());
+                webRequest = createGrailsWebRequest(request, response, getServletContext());
                 attributesChanged = true;
                 WebUtils.storeGrailsWebRequest(webRequest);
             } else {
@@ -60,7 +60,6 @@ private void renderWithinGrailsWebRequest(Map<String, Object> model, HttpServlet
      * @param model The model to use
      * @param request The HttpServletRequest
      * @param response The HttpServletResponse instance
-     * @param engine The TemplateEngine to use
      *
      * @throws java.io.IOException Thrown when an error occurs writing the response
      */

grails-web-sitemesh/src/main/groovy/org/codehaus/groovy/grails/web/sitemesh/GrailsLayoutView.java

@@ -26,6 +26,7 @@
 import org.codehaus.groovy.grails.web.servlet.WrappedResponseHolder;
 import org.codehaus.groovy.grails.web.servlet.mvc.GrailsWebRequest;
 import org.codehaus.groovy.grails.web.servlet.view.AbstractGrailsView;
+import org.codehaus.groovy.grails.web.util.WebUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.servlet.View;
 
@@ -54,19 +55,12 @@ protected void renderTemplate(Map<String, Object> model, GrailsWebRequest webReq
         Content content = obtainContent(model, webRequest, request, response);
         if (content != null) {
             beforeDecorating(content, model, webRequest, request, response);
-            switch (request.getDispatcherType()) {
-                case INCLUDE:
-                    break;
-                case ASYNC:
-                case ERROR:
-                case FORWARD:
-                case REQUEST:
-            		SpringMVCViewDecorator decorator = (SpringMVCViewDecorator) groovyPageLayoutFinder.findLayout(request, content);
-					if (decorator != null) {
-						decorator.render(content, model, request, response, webRequest.getServletContext());
-						return;
-					}
-                    break;
+            if(!WebUtils.isIncludeRequest(request)) {
+                SpringMVCViewDecorator decorator = (SpringMVCViewDecorator) groovyPageLayoutFinder.findLayout(request, content);
+                if (decorator != null) {
+                    decorator.render(content, model, request, response, webRequest.getServletContext());
+                    return;
+                }
             }
 			PrintWriter writer = response.getWriter();
 			content.writeOriginal(writer);
@@ -126,7 +120,7 @@ protected void renderInnerView(Map<String, Object> model, GrailsWebRequest webRe
 
     protected GrailsContentBufferingResponse createContentBufferingResponse(Map<String, Object> model, GrailsWebRequest webRequest, HttpServletRequest request,
             HttpServletResponse response) {
-        return new GrailsViewBufferingResponse(request, response);
+        return new GrailsViewBufferingResponse(request, response, getServletContext());
     }
 
     @Override

grails-web-sitemesh/src/main/groovy/org/codehaus/groovy/grails/web/sitemesh/GrailsViewBufferingResponse.java

@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 
+import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -27,8 +28,8 @@
 
 public class GrailsViewBufferingResponse extends GrailsContentBufferingResponse{
     private static class SimpleWebAppContext extends SiteMeshWebAppContext {
-        public SimpleWebAppContext(HttpServletRequest request, HttpServletResponse response) {
-            super(request, response, request.getServletContext());
+        public SimpleWebAppContext(HttpServletRequest request, HttpServletResponse response, ServletContext servletContext) {
+            super(request, response, servletContext);
         }
     }
 
@@ -49,7 +50,7 @@ public boolean handles(String contentType) {
         }
     }
 
-    public GrailsViewBufferingResponse(HttpServletRequest request, HttpServletResponse response) {
-        super(response, new SimpleHtmlOnlyContentProcessor(), new SimpleWebAppContext(request, response));
+    public GrailsViewBufferingResponse(HttpServletRequest request, HttpServletResponse response, ServletContext servletContext) {
+        super(response, new SimpleHtmlOnlyContentProcessor(), new SimpleWebAppContext(request, response, servletContext));
     }
 }