root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

MultipartResolutionDelegate skips Part parameter checks on Servlet 2.5 

Issue: SPR-14358
This commit is contained in:
Juergen Hoeller 2016-06-14 22:48:51 +02:00
parent 045ee52232
commit dcb2c73102
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-web/src/main/java/org/springframework/web/multipart/support/MultipartResolutionDelegate.java
View File

@ -85,9 +85,10 @@ public abstract class MultipartResolutionDelegate {
public static boolean isMultipartArgument(MethodParameter parameter) {
Class<?> paramType = parameter.getNestedParameterType();
return (MultipartFile.class == paramType || isMultipartFileCollection(parameter) ||
isMultipartFileArray(parameter) || servletPartClass == paramType ||
isPartCollection(parameter) || isPartArray(parameter));
return (MultipartFile.class == paramType ||
isMultipartFileCollection(parameter) || isMultipartFileArray(parameter) ||
(servletPartClass != null && (servletPartClass == paramType ||
isPartCollection(parameter) || isPartArray(parameter))));
}
public static Object resolveMultipartArgument(String name, MethodParameter parameter, HttpServletRequest request)