Merge branch '6.2.x'
This commit is contained in:
@@ -2214,7 +2214,7 @@ public class HttpHeaders implements Serializable {
|
||||
private final MultiValueMap<String, String> headers;
|
||||
private final Iterator<String> namesIterator;
|
||||
|
||||
public HeaderNamesIterator (MultiValueMap<String, String> headers, Map<String, Object> caseInsensitiveNames) {
|
||||
public HeaderNamesIterator(MultiValueMap<String, String> headers, Map<String, Object> caseInsensitiveNames) {
|
||||
this.headers = headers;
|
||||
this.namesIterator = caseInsensitiveNames.keySet().iterator();
|
||||
this.currentName = null;
|
||||
|
||||
@@ -241,7 +241,7 @@ public class ServletRequestDataBinder extends WebDataBinder {
|
||||
|
||||
protected @Nullable Object getRequestParameter(String name, Class<?> type) {
|
||||
Object value = this.request.getParameterValues(name);
|
||||
if (value == null && !name.endsWith ("[]") &&
|
||||
if (value == null && !name.endsWith("[]") &&
|
||||
(List.class.isAssignableFrom(type) || type.isArray())) {
|
||||
value = this.request.getParameterValues(name + "[]");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user