Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPR-17074 pass argument of addAll/putAll into constructor

Browse Source
This commit is contained in:
stsypanov
2018-07-26 23:08:14 +03:00
committed by Juergen Hoeller
parent aa656c47b8
commit 457d586859
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java
View File

@@ -159,8 +159,7 @@ public class StandardMultipartHttpServletRequest extends AbstractMultipartHttpSe
// Servlet 3.0 getParameterMap() not guaranteed to include multipart form items
// (e.g. on WebLogic 12) -> need to merge them here to be on the safe side
Map<String, String[]> paramMap = new LinkedHashMap<>();
paramMap.putAll(super.getParameterMap());
Map<String, String[]> paramMap = new LinkedHashMap<>(super.getParameterMap());
for (String paramName : this.multipartParameterNames) {
if (!paramMap.containsKey(paramName)) {
paramMap.put(paramName, getParameterValues(paramName));