Merge branch '2.3.x' into 2.4.x

Conflicts:
	grails-web-common/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/GrailsParameterMap.java

Author: graemerocher

grails-web-common/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/GrailsParameterMap.java

@@ -19,10 +19,7 @@
 import java.io.UnsupportedEncodingException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.servlet.http.HttpServletRequest;
@@ -40,6 +37,7 @@
 import org.codehaus.groovy.grails.web.util.TypeConvertingMap;
 import org.codehaus.groovy.grails.web.util.WebUtils;
 import org.grails.databinding.DataBinder;
+import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.grails.databinding.DataBindingSource;
 import org.grails.databinding.SimpleMapDataBindingSource;
 import org.springframework.context.ApplicationContext;
@@ -251,6 +249,9 @@ public Object get(Object key) {
                     returnValue = valueArray;
                 }
             }
+            else if(returnValue == null && (key instanceof Collection)) {
+                return DefaultGroovyMethods.subMap(wrappedMap, (Collection)key);
+            }
         }
         if ("date.struct".equals(returnValue)) {
             returnValue = lazyEvaluateDateParam(key);

grails-web-common/src/test/groovy/org/codehaus/groovy/grails/web/servlet/mvc/GrailsParameterMapTests.groovy

@@ -13,6 +13,16 @@ class GrailsParameterMapTests extends GroovyTestCase {
     GrailsParameterMap theMap
     MockHttpServletRequest mockRequest = new MockHttpServletRequest()
 
+    void testSubmapViaArraySubscript() {
+        mockRequest.addParameter("name", "Dierk Koenig")
+        mockRequest.addParameter("dob", "01/01/1970")
+        mockRequest.addParameter("address.postCode", "345435")
+        mockRequest.addParameter("address.town", "Swindon")
+        theMap = new GrailsParameterMap(mockRequest)
+
+        assert theMap['name', 'dob'] == [name:"Dierk Koenig", dob:"01/01/1970"]
+    }
+
     void testDateMessageSourceFormat() {
 
         try {
@@ -288,6 +298,8 @@ class GrailsParameterMapTests extends GroovyTestCase {
             String name = (String) o
             params.put(name, theMap.get(name))
         }
+
+
     }
 
     void testMultiDimensionParams() {