When an UrlMappingInfo for a status code is matched, add parameters from UrlMappingInfo of previous request

Author: sdelamo

grails-web-mvc/src/main/groovy/org/grails/web/errors/GrailsExceptionResolver.java

@@ -20,16 +20,15 @@
 import grails.util.Environment;
 
 import java.io.IOException;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import grails.web.mapping.UrlMapping;
+import grails.web.servlet.mvc.GrailsParameterMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.codehaus.groovy.control.CompilationFailedException;
@@ -41,8 +40,10 @@
 import grails.core.support.GrailsApplicationAware;
 import grails.web.mapping.UrlMappingInfo;
 import org.grails.exceptions.ExceptionUtils;
+import org.grails.web.mapping.DefaultUrlMappingInfo;
 import org.grails.web.mapping.UrlMappingUtils;
 import grails.web.mapping.UrlMappingsHolder;
+import org.grails.web.servlet.mvc.GrailsWebRequest;
 import org.grails.web.util.GrailsApplicationAttributes;
 import org.grails.web.servlet.mvc.exceptions.GrailsMVCException;
 import org.grails.web.sitemesh.GrailsContentBufferingResponse;
@@ -162,6 +163,18 @@ protected ModelAndView resolveViewOrForward(Exception ex, UrlMappingsHolder urlM
             HttpServletResponse response, ModelAndView mv) {
 
         UrlMappingInfo info = matchStatusCode(ex, urlMappings);
+
+        if ( info != null ) {
+            UrlMappingInfo requestInfo = urlMappings.match(request.getRequestURI());
+
+            if ( requestInfo != null ) {
+                Map params = new HashMap();
+                params.putAll(requestInfo.getParameters());
+                params.putAll(UrlMappingUtils.collectParamsNotInUrlMappingKeywords(info.getParameters()));
+                info = new DefaultUrlMappingInfo(info, params, grailsApplication);
+            }
+        }
+
         try {
             if (info != null && info.getViewName() != null) {
                 resolveView(request, info, mv);

grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingInfo.java

@@ -121,4 +121,6 @@ public interface UrlMappingInfo {
      * @return redirect information for this url mapping, null if no redirect is specified
      */
     Object getRedirectInfo();
+
+    UrlMappingData getUrlData();
 }

grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingInfo.java

@@ -30,6 +30,7 @@
 import grails.web.mapping.UrlMapping;
 import grails.web.mapping.UrlMappingData;
 import grails.core.GrailsApplication;
+import grails.web.mapping.UrlMappingInfo;
 import grails.web.mapping.exceptions.UrlMappingException;
 import org.grails.web.servlet.mvc.GrailsWebRequest;
 import org.grails.web.util.WebUtils;
@@ -124,7 +125,6 @@ public DefaultUrlMappingInfo(Object viewName, Map params, UrlMappingData urlData
         this(params, urlData, grailsApplication);
         this.viewName = viewName;
         Assert.notNull(viewName, "Argument [viewName] cannot be null or blank");
-
     }
 
     public DefaultUrlMappingInfo(Object uri, UrlMappingData data, GrailsApplication grailsApplication) {
@@ -140,6 +140,17 @@ public DefaultUrlMappingInfo(Object uri,String httpMethod, UrlMappingData data,
         Assert.notNull(uri, "Argument [uri] cannot be null or blank");
     }
 
+    public DefaultUrlMappingInfo(UrlMappingInfo info, Map params, GrailsApplication grailsApplication) {
+        this(params, info.getUrlData(), grailsApplication);
+        this.redirectInfo = info.getRedirectInfo();
+        this.controllerName = info.getControllerName();
+        this.actionName = info.getActionName();
+        this.namespace = info.getNamespace();
+        this.pluginName = info.getPluginName();
+        this.viewName = info.getViewName();
+    }
+
+
     @Override
     public String getHttpMethod() {
         return httpMethod;
@@ -268,6 +279,11 @@ public Object getRedirectInfo() {
         return redirectInfo;
     }
 
+    @Override
+    public UrlMappingData getUrlData() {
+        return null;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

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

@@ -15,6 +15,7 @@
  */
 package org.grails.web.mapping
 
+import grails.web.mapping.UrlMappingData
 import groovy.transform.CompileStatic
 
 /**
@@ -64,4 +65,9 @@ class ForwardUrlMappingInfo extends AbstractUrlMappingInfo {
     boolean isParsingRequest() {
         return false
     }
+
+    @Override
+    UrlMappingData getUrlData() {
+        null
+    }
 }

grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingUtilsSpec.groovy

@@ -0,0 +1,19 @@
+package org.grails.web.mapping
+
+import grails.core.GrailsApplication
+import grails.web.mapping.UrlMappingData
+import grails.web.mapping.UrlMappingInfo
+import spock.lang.Specification
+
+class UrlMappingUtilsSpec extends Specification {
+
+    def "test buildDispatchUrlForMapping"() {
+        when:
+        UrlMappingData urlData = new ResponseCodeMappingData("500")
+        UrlMappingInfo info = new DefaultUrlMappingInfo([controller: 'error', action: 'logError'], urlData, null)
+        String dispatchUrl = UrlMappingUtils.buildDispatchUrlForMapping(info, true)
+
+        then:
+        dispatchUrl == 'fresa'
+    }
+}