Save & restore GrailsLayoutDecoratorMapper.LAYOUT_ATTRIBUTE & RENDERING_VIEW before/after include request.

Possibly related to GRAILS-9005 .

Author: lhotari

grails-web/src/main/groovy/org/codehaus/groovy/grails/web/util/WebUtils.java

@@ -49,6 +49,7 @@
 import org.codehaus.groovy.grails.web.servlet.mvc.GrailsParameterMap;
 import org.codehaus.groovy.grails.web.servlet.mvc.GrailsWebRequest;
 import org.codehaus.groovy.grails.web.servlet.mvc.exceptions.ControllerExecutionException;
+import org.codehaus.groovy.grails.web.sitemesh.GrailsLayoutDecoratorMapper;
 import org.springframework.context.ApplicationContext;
 import org.springframework.util.Assert;
 import org.springframework.web.context.WebApplicationContext;
@@ -335,9 +336,19 @@ public static IncludedContent includeForUrlMappingInfo(HttpServletRequest reques
         ModelAndView currentMv = null;
         Binding currentPageBinding = null;
         Map currentParams = null;
+        Object currentLayoutAttribute = null;
+        Object currentRenderingView = null;
         if (webRequest != null) {
             currentPageBinding = (Binding) webRequest.getAttribute(GrailsApplicationAttributes.PAGE_SCOPE, 0);
             webRequest.removeAttribute(GrailsApplicationAttributes.PAGE_SCOPE, 0);
+            currentLayoutAttribute = webRequest.getAttribute(GrailsLayoutDecoratorMapper.LAYOUT_ATTRIBUTE, 0);
+            if(currentLayoutAttribute != null) {
+                webRequest.removeAttribute(GrailsLayoutDecoratorMapper.LAYOUT_ATTRIBUTE, 0);
+            }
+            currentRenderingView = webRequest.getAttribute(GrailsLayoutDecoratorMapper.RENDERING_VIEW, 0);
+            if(currentRenderingView != null) {
+                webRequest.removeAttribute(GrailsLayoutDecoratorMapper.RENDERING_VIEW, 0);
+            }
             currentController = webRequest.getControllerName();
             currentAction = webRequest.getActionName();
             currentId = webRequest.getId();
@@ -357,6 +368,12 @@ public static IncludedContent includeForUrlMappingInfo(HttpServletRequest reques
         finally {
             if (webRequest!=null) {
                 webRequest.setAttribute(GrailsApplicationAttributes.PAGE_SCOPE,currentPageBinding, 0);
+                if(currentLayoutAttribute != null) {
+                    webRequest.setAttribute(GrailsLayoutDecoratorMapper.LAYOUT_ATTRIBUTE, currentLayoutAttribute, 0);
+                }
+                if(currentRenderingView != null) {
+                    webRequest.setAttribute(GrailsLayoutDecoratorMapper.RENDERING_VIEW, currentRenderingView, 0);
+                }
                 webRequest.getParameterMap().clear();
                 webRequest.getParameterMap().putAll(currentParams);
                 webRequest.setId(currentId);