Merge branch '3.0.x' into 3.1.x

Author: graemerocher

grails-test-suite-web/src/test/groovy/org/grails/web/mapping/DoubleWildcardUrlMappingTests.groovy

@@ -71,6 +71,16 @@ class DoubleWildCardController {
         UrlMappingInfo info = infos[0]
         info.configure webRequest
         assertEquals 'wrong controller name', 'someOther', info.getControllerName()
+
+
+        infos = holder.matchAll('/someOther/1+2')
+        assert infos
+
+        info = infos[0]
+        info.configure webRequest
+        assertEquals 'wrong controller name', 'someOther', info.getControllerName()
+        assertEquals 'wrong controller name', '1+2', info.getActionName()
+
     }
 
     void testDoubleWildcardInParam() {

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

@@ -62,7 +62,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
         try {
             WebUtils.storeGrailsWebRequest(webRequest);
 
-            if(!WebUtils.isForward(request)) {
+            if(!WebUtils.isForwardOrInclude(request)) {
                 // Set the flash scope instance to its next state. We do
                 // this here so that the flash is available from Grails
                 // filters in a valid state.

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

@@ -20,12 +20,7 @@
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import grails.util.GrailsStringUtils;
 import org.grails.web.servlet.mvc.GrailsWebRequest;
@@ -49,7 +44,7 @@ public Map<String, Object> getParams() {
 
     public void setParams(final Map newParams) {
         Collection keys = newParams.keySet();
-        keys = DefaultGroovyMethods.toList(keys);
+        keys = new ArrayList(keys);
         Collections.sort((List) keys, new Comparator() {
             public int compare(Object leftKey, Object rightKey) {
                 Object leftValue = newParams.get(leftKey);
@@ -90,13 +85,8 @@ protected void populateParamsForMapping(GrailsWebRequest webRequest) {
             if (param instanceof Closure) {
                 param = evaluateNameForValue(param);
             }
-            if (param instanceof String) {
-                try {
-                    param = URLDecoder.decode((String) param, encoding);
-                }
-                catch (UnsupportedEncodingException e) {
-                    param = evaluateNameForValue(param);
-                }
+            if (param instanceof CharSequence) {
+                param = param.toString();
             }
             dispatchParams.put(name, param);
         }

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

@@ -164,7 +164,9 @@ class UrlMappingsHandlerMapping extends AbstractHandlerMapping {
                         request.setAttribute(MATCHED_REQUEST, info)
                         return info
                     }
-                    else if(info.viewName || info.URI) return info
+                    else if(info.viewName || info.URI) {
+                        return info
+                    }
                 }
             }