diff --git a/grace-web-mvc/build.gradle b/grace-web-mvc/build.gradle index a1d1c4b56a..b15b9fb5f2 100644 --- a/grace-web-mvc/build.gradle +++ b/grace-web-mvc/build.gradle @@ -1,7 +1,6 @@ dependencies { api project(":grace-gsp") api project(":grace-web") - api project(":grace-web-sitemesh") api project(":grace-web-url-mappings") compileOnlyApi libs.jakarta.servlet diff --git a/grace-web-mvc/src/main/groovy/org/grails/web/errors/GrailsExceptionResolver.java b/grace-web-mvc/src/main/groovy/org/grails/web/errors/GrailsExceptionResolver.java index 614d036a02..7f411fe349 100644 --- a/grace-web-mvc/src/main/groovy/org/grails/web/errors/GrailsExceptionResolver.java +++ b/grace-web-mvc/src/main/groovy/org/grails/web/errors/GrailsExceptionResolver.java @@ -52,7 +52,6 @@ import org.grails.web.mapping.DefaultUrlMappingInfo; import org.grails.web.mapping.UrlMappingUtils; import org.grails.web.servlet.mvc.exceptions.GrailsMVCException; -import org.grails.web.sitemesh.GrailsContentBufferingResponse; import org.grails.web.util.GrailsApplicationAttributes; import org.grails.web.util.WebUtils; @@ -195,10 +194,6 @@ protected ModelAndView resolveViewOrForward(Exception ex, UrlMappingsHolder urlM else if (info != null && info.getControllerName() != null) { String uri = determineUri(request); if (!response.isCommitted()) { - if (response instanceof GrailsContentBufferingResponse) { - // clear the output from sitemesh before rendering error page - ((GrailsContentBufferingResponse) response).deactivateSitemesh(); - } forwardRequest(info, request, response, mv, uri); // return an empty ModelAndView since the error handler has been processed return new ModelAndView();