Browse Source

MultipartResolutionDelegate skips Part parameter checks on Servlet 2.5

Issue: SPR-14358
pull/1079/head
Juergen Hoeller 10 years ago
parent
commit
dcb2c73102
  1. 7
      spring-web/src/main/java/org/springframework/web/multipart/support/MultipartResolutionDelegate.java

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

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

Loading…
Cancel
Save