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

MultipartResolutionDelegate's resolveMultipartArgument properly operates on Servlet 2.5 

Issue: SPR-14461
This commit is contained in:
Juergen Hoeller 2016-07-15 15:42:32 +02:00
parent 29f980ec72
commit 70e666b4a3
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,8 @@ public abstract class MultipartResolutionDelegate {
return null;
}
}
else if (servletPartClass == parameter.getNestedParameterType()) {
else if (servletPartClass != null) {
if (servletPartClass == parameter.getNestedParameterType()) {
return (isMultipart ? RequestPartResolver.resolvePart(request, name) : null);
}
else if (isPartCollection(parameter)) {
@ -131,9 +132,8 @@ public abstract class MultipartResolutionDelegate {
else if (isPartArray(parameter)) {
return (isMultipart ? RequestPartResolver.resolvePartArray(request, name) : null);
}
else {
return UNRESOLVABLE;
}
return UNRESOLVABLE;
}
private static boolean isMultipartFileCollection(MethodParameter methodParam) {