Merge branch '3.1.x' into 3.2.x

Author: graemerocher

grails-bootstrap/src/main/groovy/org/grails/exceptions/reporting/DefaultStackTraceFilterer.java

@@ -33,26 +33,21 @@ public class DefaultStackTraceFilterer implements StackTraceFilterer {
     public static final Log STACK_LOG = LogFactory.getLog(STACK_LOG_NAME);
 
     private static final String[] DEFAULT_INTERNAL_PACKAGES = new String[] {
-        "org.grails.plugin.resource.DevMode",
-        "org.grails.",
-        "org.codehaus.groovy.grails.",
-        "gant.",
         "org.codehaus.groovy.runtime.",
         "org.codehaus.groovy.reflection.",
         "org.codehaus.groovy.ast.",
-        "org.codehaus.gant.",
-        "groovy.",
+        "org.springframework.web.filter",
+        "org.springframework.boot.actuate",
         "org.mortbay.",
+        "groovy.lang.",
         "org.apache.catalina.",
         "org.apache.coyote.",
         "org.apache.tomcat.",
         "net.sf.cglib.proxy.",
         "sun.",
         "java.lang.reflect.",
-        "org.springframework.",
         "org.springsource.loaded.",
         "com.opensymphony.",
-        "org.hibernate.",
         "javax.servlet."
     };
 

grails-core/src/test/groovy/org/grails/exception/reporting/StackTraceFiltererSpec.groovy

@@ -36,7 +36,7 @@ class FooController {
 
         then: "Only valid stack elements are retained"
             exception != null
-            exception.stackTrace.size() == 2
+            exception.stackTrace.size() == 3
             exception.stackTrace[0].className == 'test.FooController'
             exception.stackTrace[0].lineNumber == 10
             exception.stackTrace[1].lineNumber == 6
@@ -84,7 +84,7 @@ class FooService {
 
         then: "Only valid stack elements are retained"
             exception != null
-            exception.stackTrace.size() == 2
+            exception.stackTrace.size() == 3
             exception.stackTrace[0].className == 'test.FooController'
             exception.stackTrace[0].lineNumber == 15
             exception.stackTrace[1].lineNumber == 7

grails-core/src/test/groovy/org/grails/exception/reporting/StackTracePrinterSpec.groovy

@@ -28,7 +28,7 @@ class StackTracePrinterSpec extends Specification {
 
         then:"The formatting is correctly applied"
             result != null
-            result.contains '->> 7 | callMe in test.FooController'
+            result.contains '->>  7 | callMe             in test.FooController'
     }
 
     void "Test pretty print nested stack trace"() {
@@ -50,8 +50,8 @@ class StackTracePrinterSpec extends Specification {
 
         then:"The formatting is correctly applied"
             result != null
-            result.contains '->> 14 | nesting in test.FooController'
-            result.contains '->>  3 | callMe  in test.FooService'
+            result.contains '->> 14 | nesting            in test.FooController'
+            result.contains '->>  3 | callMe             in test.FooService'
     }
 
     void "Test pretty print code snippet"() {

grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/OutputAwareHttpServletResponse.groovy

@@ -0,0 +1,36 @@
+package org.grails.web.servlet.mvc
+
+import groovy.transform.CompileStatic
+import groovy.transform.InheritConstructors
+
+import javax.servlet.ServletOutputStream
+import javax.servlet.http.HttpServletResponseWrapper
+
+/**
+ * Tracks whether getOutputStream() was called in order to prevent calls to getWriter() after
+ * getOutputStream() has been called
+ *
+ *
+ * @since 3.1.12
+ * @author Graeme Rocher
+ */
+@CompileStatic
+@InheritConstructors
+class OutputAwareHttpServletResponse extends HttpServletResponseWrapper {
+
+    /**
+     * Whether the writer is available
+     */
+    boolean writerAvailable = true
+
+    @Override
+    PrintWriter getWriter() throws IOException {
+        return super.getWriter()
+    }
+
+    @Override
+    ServletOutputStream getOutputStream() throws IOException {
+        writerAvailable = false
+        return super.getOutputStream()
+    }
+}

grails-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/GrailsWebRequestFilter.java

@@ -50,6 +50,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
             throws ServletException, IOException {
 
         LocaleContextHolder.setLocale(request.getLocale());
+        response = new OutputAwareHttpServletResponse(response);
+
         boolean isIncludeOrForward = WebUtils.isForward(request) || WebUtils.isInclude(request);
         GrailsWebRequest previous = isIncludeOrForward ? GrailsWebRequest.lookup(request) : null;
         GrailsWebRequest webRequest = new GrailsWebRequest(request, response, getServletContext());

grails-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutView.java

@@ -25,6 +25,7 @@
 
 import org.grails.web.servlet.WrappedResponseHolder;
 import org.grails.web.servlet.mvc.GrailsWebRequest;
+import org.grails.web.servlet.mvc.OutputAwareHttpServletResponse;
 import org.grails.web.servlet.view.AbstractGrailsView;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,40 +56,47 @@ public String getContentType() {
     @Override
     protected void renderTemplate(Map<String, Object> model, GrailsWebRequest webRequest, HttpServletRequest request,
             HttpServletResponse response) throws Exception {
+
+        boolean isCommitted = response.isCommitted() && (response instanceof OutputAwareHttpServletResponse) && !((OutputAwareHttpServletResponse) response).isWriterAvailable();
+        if( !isCommitted ) {
+
             Content content = obtainContent(model, webRequest, request, response);
-        if (content != null) {
-
-            beforeDecorating(content, model, webRequest, request, response);
-            switch (request.getDispatcherType()) {
-                case INCLUDE:
-                    break;
-                case ASYNC:
-                case ERROR:
-                case FORWARD:
-                case REQUEST:
-                    if(LOG.isDebugEnabled()) {
-                        LOG.debug("Finding layout for request and content" );
-                    }
-                    SpringMVCViewDecorator decorator = (SpringMVCViewDecorator) groovyPageLayoutFinder.findLayout(request, content);
-                    if (decorator != null) {
+            if (content != null) {
+
+                beforeDecorating(content, model, webRequest, request, response);
+                switch (request.getDispatcherType()) {
+                    case INCLUDE:
+                        break;
+                    case ASYNC:
+                    case ERROR:
+                    case FORWARD:
+                    case REQUEST:
                         if(LOG.isDebugEnabled()) {
-                            LOG.debug("Found layout. Rendering content for layout and model {}", decorator.getPage(), model);
+                            LOG.debug("Finding layout for request and content" );
                         }
-
-                        decorator.render(content, model, request, response, webRequest.getServletContext());
-                        return;
-                    }
-                    break;
-            }
-            PrintWriter writer = response.getWriter();
-            if(LOG.isDebugEnabled()) {
-                LOG.debug("Layout not applicable to response, writing original content");
-            }
-            content.writeOriginal(writer);
-            if (!response.isCommitted()) {
-                writer.flush();
+                        SpringMVCViewDecorator decorator = (SpringMVCViewDecorator) groovyPageLayoutFinder.findLayout(request, content);
+                        if (decorator != null) {
+                            if(LOG.isDebugEnabled()) {
+                                LOG.debug("Found layout. Rendering content for layout and model {}", decorator.getPage(), model);
+                            }
+
+                            decorator.render(content, model, request, response, webRequest.getServletContext());
+                            return;
+                        }
+                        break;
+                }
+                PrintWriter writer = response.getWriter();
+                if(LOG.isDebugEnabled()) {
+                    LOG.debug("Layout not applicable to response, writing original content");
+                }
+                content.writeOriginal(writer);
+                if (!response.isCommitted()) {
+                    writer.flush();
+                }
             }
         }
+
+
     }
 
     protected void beforeDecorating(Content content, Map<String, Object> model, GrailsWebRequest webRequest,