From 70e666b4a31d83c050daf23846b0fb3b68f1a011 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 15 Jul 2016 15:42:32 +0200 Subject: [PATCH] MultipartResolutionDelegate's resolveMultipartArgument properly operates on Servlet 2.5 Issue: SPR-14461 --- .../support/MultipartResolutionDelegate.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 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 305b639642f..42248276181 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 @@ -122,18 +122,18 @@ public abstract class MultipartResolutionDelegate { return null; } } - else if (servletPartClass == parameter.getNestedParameterType()) { - return (isMultipart ? RequestPartResolver.resolvePart(request, name) : null); - } - else if (isPartCollection(parameter)) { - return (isMultipart ? RequestPartResolver.resolvePartList(request, name) : null); - } - else if (isPartArray(parameter)) { - return (isMultipart ? RequestPartResolver.resolvePartArray(request, name) : null); - } - else { - return UNRESOLVABLE; + else if (servletPartClass != null) { + if (servletPartClass == parameter.getNestedParameterType()) { + return (isMultipart ? RequestPartResolver.resolvePart(request, name) : null); + } + else if (isPartCollection(parameter)) { + return (isMultipart ? RequestPartResolver.resolvePartList(request, name) : null); + } + else if (isPartArray(parameter)) { + return (isMultipart ? RequestPartResolver.resolvePartArray(request, name) : null); + } } + return UNRESOLVABLE; } private static boolean isMultipartFileCollection(MethodParameter methodParam) {