Merge branch '2.0.x' of github.com:grails/grails-core into 2.0.x

graemerocher · graemerocher · commit ef2de46ca0c7 · 2012-03-29T11:09:45.000+02:00
diff --git a/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/ErrorHandlingServlet.java b/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/ErrorHandlingServlet.java
@@ -107,7 +107,6 @@ protected void doDispatch(final HttpServletRequest request, final HttpServletRes
                 RequestContextHolder.setRequestAttributes(webRequest);
                 urlMappingInfo.configure(webRequest);
             }
-            request.setAttribute("com.opensymphony.sitemesh.APPLIED_ONCE", null);
 
             HttpServletResponse originalResponse = WrappedResponseHolder.getWrappedResponse();
 

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,6 @@ protected void doDispatch(final HttpServletRequest request, final HttpServletRes`
`107`	`107`	`RequestContextHolder.setRequestAttributes(webRequest);`
`108`	`108`	`urlMappingInfo.configure(webRequest);`
`109`	`109`	`}`
`110`		`- request.setAttribute("com.opensymphony.sitemesh.APPLIED_ONCE", null);`
`111`	`110`
`112`	`111`	`HttpServletResponse originalResponse = WrappedResponseHolder.getWrappedResponse();`
`113`	`112`