Merge branch '3.1.x' into 3.2.x

graemerocher · graemerocher · commit fee1945258d1 · 2016-10-26T12:07:09.000+02:00
diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingInfo.java b/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingInfo.java
@@ -199,7 +199,9 @@ public String getId() {
     }
 
     private String checkDispatchAction(HttpServletRequest request) {
-        if (request.getAttribute(WebUtils.EXCEPTION_ATTRIBUTE) != null) return null;
+        if (request.getAttribute(WebUtils.EXCEPTION_ATTRIBUTE) != null || WebUtils.isForwardOrInclude(request)) {
+            return null;
+        }
 
         String dispatchActionName = null;
         Enumeration<String> paramNames = tryMultipartParams(request, request.getParameterNames());

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,9 @@ public String getId() {`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`private String checkDispatchAction(HttpServletRequest request) {`
`202`		`- if (request.getAttribute(WebUtils.EXCEPTION_ATTRIBUTE) != null) return null;`
	`202`	`+ if (request.getAttribute(WebUtils.EXCEPTION_ATTRIBUTE) != null \|\| WebUtils.isForwardOrInclude(request)) {`
	`203`	`+ return null;`
	`204`	`+ }`
`203`	`205`
`204`	`206`	`String dispatchActionName = null;`
`205`	`207`	`Enumeration<String> paramNames = tryMultipartParams(request, request.getParameterNames());`