only return the model for an async request if it is not in an error state

Author: graemerocher

grails-web-common/src/main/groovy/org/grails/web/util/WebUtils.java

@@ -65,6 +65,7 @@ public class WebUtils extends org.springframework.web.util.WebUtils {
     public static final String GRAILS_DISPATCH_EXTENSION = ".dispatch";
     public static final String GRAILS_SERVLET_PATH = "/grails";
     public static final String EXCEPTION_ATTRIBUTE = "exception";
+    public static final String ASYNC_REQUEST_URI_ATTRIBUTE = "javax.servlet.async.request_uri";
 
     public static ViewResolver lookupViewResolver(ServletContext servletContext) {
         WebApplicationContext wac = WebApplicationContextUtils
@@ -485,6 +486,25 @@ public static boolean isForward(HttpServletRequest request) {
         return request.getAttribute(FORWARD_REQUEST_URI_ATTRIBUTE) != null;
     }
 
+    /**
+     * Check whether the given request is a forward request
+     *
+     * @param request The request
+     * @return True if it is a forward request
+     */
+    public static boolean isAsync(HttpServletRequest request) {
+        return request.getAttribute(ASYNC_REQUEST_URI_ATTRIBUTE) != null;
+    }
+
+    /**
+     * Check whether the given request is a forward request
+     *
+     * @param request The request
+     * @return True if it is a forward request
+     */
+    public static boolean isError(HttpServletRequest request) {
+        return request.getAttribute(ERROR_STATUS_CODE_ATTRIBUTE) != null;
+    }
     /**
      * Check whether the given request is an include request
      *

grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/UrlMappingsInfoHandlerAdapter.groovy

@@ -10,6 +10,7 @@ import groovy.transform.CompileStatic
 import org.grails.web.servlet.mvc.ActionResultTransformer
 import org.grails.web.servlet.mvc.GrailsWebRequest
 import org.grails.web.util.GrailsApplicationAttributes
+import org.grails.web.util.WebUtils
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContextAware
 import org.springframework.web.servlet.HandlerAdapter
@@ -28,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap
 @CompileStatic
 class UrlMappingsInfoHandlerAdapter implements HandlerAdapter, ApplicationContextAware{
 
-    private  static final String ASYNC_REQUEST_URI_ATTR = "javax.servlet.async.request_uri"
+
     ApplicationContext applicationContext
 
     protected Collection<ActionResultTransformer> actionResultTransformers = Collections.emptyList();
@@ -51,7 +52,7 @@ class UrlMappingsInfoHandlerAdapter implements HandlerAdapter, ApplicationContex
 
         GrailsWebRequest webRequest = GrailsWebRequest.lookup(request)
 
-        boolean isAsyncRequest = request.getAttribute(ASYNC_REQUEST_URI_ATTR) != null;
+        boolean isAsyncRequest = WebUtils.isAsync(request) && !WebUtils.isError(request);
         if(isAsyncRequest) {
             Object modelAndView = request.getAttribute(GrailsApplicationAttributes.MODEL_AND_VIEW);
             if(modelAndView instanceof ModelAndView) {