Skip to content

Commit efc9af4

Browse files
authored
Merge pull request #1247 from rainboyan
* pr/1247: Make 'grace-web-mvc' decoupled from 'grace-web-sitemesh' Closes gh-1247
2 parents a6908f4 + 44fc005 commit efc9af4

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

grace-web-mvc/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
dependencies {
22
api project(":grace-gsp")
33
api project(":grace-web")
4-
api project(":grace-web-sitemesh")
54
api project(":grace-web-url-mappings")
65

76
compileOnlyApi libs.jakarta.servlet

grace-web-mvc/src/main/groovy/org/grails/web/errors/GrailsExceptionResolver.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import org.grails.web.mapping.DefaultUrlMappingInfo;
5353
import org.grails.web.mapping.UrlMappingUtils;
5454
import org.grails.web.servlet.mvc.exceptions.GrailsMVCException;
55-
import org.grails.web.sitemesh.GrailsContentBufferingResponse;
5655
import org.grails.web.util.GrailsApplicationAttributes;
5756
import org.grails.web.util.WebUtils;
5857

@@ -195,10 +194,6 @@ protected ModelAndView resolveViewOrForward(Exception ex, UrlMappingsHolder urlM
195194
else if (info != null && info.getControllerName() != null) {
196195
String uri = determineUri(request);
197196
if (!response.isCommitted()) {
198-
if (response instanceof GrailsContentBufferingResponse) {
199-
// clear the output from sitemesh before rendering error page
200-
((GrailsContentBufferingResponse) response).deactivateSitemesh();
201-
}
202197
forwardRequest(info, request, response, mv, uri);
203198
// return an empty ModelAndView since the error handler has been processed
204199
return new ModelAndView();

0 commit comments

Comments
 (0)