diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java index b12c060ab58d..50412e450763 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java @@ -1102,7 +1102,8 @@ else if (hasMultipartException(request)) { return this.multipartResolver.resolveMultipart(request); } catch (MultipartException ex) { - if (request.getAttribute(WebUtils.ERROR_EXCEPTION_ATTRIBUTE) != null) { + if (request.getAttribute(WebUtils.ERROR_EXCEPTION_ATTRIBUTE) != null || + DispatcherType.ERROR.equals(request.getDispatcherType())) { logger.debug("Multipart resolution failed for error dispatch", ex); // Keep processing error dispatch with regular request handle below } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java index 1bb17460bacb..45b9e1a3859a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java @@ -17,6 +17,7 @@ package org.springframework.web.servlet; import java.io.IOException; +import java.lang.reflect.Field; import java.util.Collections; import java.util.Locale; import java.util.Map; @@ -77,6 +78,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; /** * Tests for {@link DispatcherServlet}. @@ -275,6 +277,33 @@ void multipartResolutionFailed() throws Exception { .isInstanceOf(MaxUploadSizeExceededException.class); } + @Test + void multipartResolutionFailureOnErrorDispatchDoesNotReplaceRequest() throws Exception { + DispatcherServlet servlet = new DispatcherServlet(); + MultipartResolver multipartResolver = mock(MultipartResolver.class); + setMultipartResolver(servlet, multipartResolver); + MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "POST", "/upload"); + request.setDispatcherType(DispatcherType.ERROR); + when(multipartResolver.isMultipart(request)).thenReturn(true); + when(multipartResolver.resolveMultipart(request)).thenThrow(new MaxUploadSizeExceededException(1024)); + + assertThat(servlet.checkMultipart(request)).isSameAs(request); + } + + @Test + void multipartResolutionFailureOnRequestDispatchIsNotSuppressed() throws Exception { + DispatcherServlet servlet = new DispatcherServlet(); + MultipartResolver multipartResolver = mock(MultipartResolver.class); + setMultipartResolver(servlet, multipartResolver); + MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "POST", "/upload"); + request.setDispatcherType(DispatcherType.REQUEST); + when(multipartResolver.isMultipart(request)).thenReturn(true); + when(multipartResolver.resolveMultipart(request)).thenThrow(new MaxUploadSizeExceededException(1024)); + + assertThatThrownBy(() -> servlet.checkMultipart(request)) + .isInstanceOf(MaxUploadSizeExceededException.class); + } + @Test void handlerInterceptorAbort() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "GET", "/locale.do"); @@ -921,6 +950,14 @@ void shouldResetContentHeadersIfNotCommitted() throws Exception { } + private static void setMultipartResolver(DispatcherServlet servlet, MultipartResolver multipartResolver) + throws ReflectiveOperationException { + Field field = DispatcherServlet.class.getDeclaredField("multipartResolver"); + field.setAccessible(true); + field.set(servlet, multipartResolver); + } + + public static class ControllerFromParent implements Controller { @Override