Browse Source

MultipartResolutionDelegate's resolveMultipartArgument properly operates on Servlet 2.5

Issue: SPR-14461
pull/1405/head
Juergen Hoeller 10 years ago
parent
commit
70e666b4a3
  1. 22
      spring-web/src/main/java/org/springframework/web/multipart/support/MultipartResolutionDelegate.java

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

@ -122,18 +122,18 @@ public abstract class MultipartResolutionDelegate { @@ -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) {

Loading…
Cancel
Save