Merge pull request #10163 from ColinHarrington/issue-10150

graemerocher · web-flow · commit 112a44126b4f · 2016-09-21T16:01:22.000+02:00
contentType needs to be kept in sync with the sitmesh webAppContext
diff --git a/grails-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsContentBufferingResponse.java b/grails-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsContentBufferingResponse.java
@@ -56,6 +56,9 @@ public void setContentType(String contentType) {
         this.contentProcessor = contentProcessor;
         this.webAppContext = webAppContext;
         pageResponseWrapper = (GrailsPageResponseWrapper) getResponse();
+        if (response.getContentType() != null) {
+            webAppContext.setContentType(response.getContentType());
+        }
     }
 
     public HttpServletResponse getTargetResponse() {

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,9 @@ public void setContentType(String contentType) {`
`56`	`56`	`this.contentProcessor = contentProcessor;`
`57`	`57`	`this.webAppContext = webAppContext;`
`58`	`58`	`pageResponseWrapper = (GrailsPageResponseWrapper) getResponse();`
	`59`	`+ if (response.getContentType() != null) {`
	`60`	`+ webAppContext.setContentType(response.getContentType());`
	`61`	`+ }`
`59`	`62`	`}`
`60`	`63`
`61`	`64`	`public HttpServletResponse getTargetResponse() {`