Issue: SPR-15231
@ -1096,7 +1096,18 @@ public class DispatcherServlet extends FrameworkServlet {
"skipping re-resolution for undisturbed error rendering");
}
else {
return this.multipartResolver.resolveMultipart(request);
try {
catch (MultipartException ex) {
if (request.getAttribute(WebUtils.ERROR_EXCEPTION_ATTRIBUTE) != null) {
logger.debug("Multipart resolution failed for error dispatch", ex);
// Keep processing error dispatch with regular request handle below
throw ex;
// If not returned before: return original request.