From dcb2c73102302d0795748ea45dca8031be808f23 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 14 Jun 2016 22:48:51 +0200 Subject: [PATCH] MultipartResolutionDelegate skips Part parameter checks on Servlet 2.5 Issue: SPR-14358 --- .../web/multipart/support/MultipartResolutionDelegate.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartResolutionDelegate.java b/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartResolutionDelegate.java index dec69b8801e..4356d14603d 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartResolutionDelegate.java +++ b/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) { 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)