Only flush() and close() the response if no error occurs. Fixes #9473

Author: graemerocher

grails-plugin-converters/src/main/groovy/grails/converters/JSON.java

@@ -130,12 +130,8 @@ private void finalizeRender(Writer out) {
      */
     public void render(Writer out) throws ConverterException {
         prepareRender(out);
-        try {
-            value(target);
-        }
-        finally {
-            finalizeRender(out);
-        }
+        value(target);
+        finalizeRender(out);
     }
 
     /**

grails-plugin-converters/src/main/groovy/grails/converters/XML.java

@@ -128,12 +128,12 @@ public void render(Writer out) throws ConverterException {
             writer.startNode(getElementName(target));
             convertAnother(target);
             writer.end();
+            finalizeRender(out);
         }
         catch (Exception e) {
             throw new ConverterException(e);
         }
         finally {
-            finalizeRender(out);
             isRendering = false;
         }
     }

grails-web-taglib/src/main/groovy/org/grails/web/taglib/encoder/WebOutputContextLookup.java

@@ -26,6 +26,7 @@
 import org.grails.web.servlet.mvc.GrailsWebRequest;
 import org.grails.web.taglib.WebRequestTemplateVariableBinding;
 import org.grails.web.util.GrailsApplicationAttributes;
+import org.grails.web.util.WebUtils;
 import org.springframework.core.Ordered;
 import org.springframework.web.context.request.RequestAttributes;
 
@@ -105,8 +106,9 @@ public void setContentType(String contentType) {
 
         @Override
         public boolean isContentTypeAlreadySet() {
-            HttpServletResponse response = lookupResponse();
-            return response.isCommitted() || response.getContentType() != null;
+            GrailsWebRequest webRequest = lookupWebRequest();
+            HttpServletResponse response = webRequest.getResponse();
+            return response.isCommitted() || (response.getContentType() != null && webRequest.getRequest().getAttribute(WebUtils.ERROR_EXCEPTION_ATTRIBUTE) == null);
         }
 
         protected GrailsWebRequest lookupWebRequest() {