Merge branch '6.1.x'

spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java

@@ -1117,10 +1117,11 @@ public class DispatcherServlet extends FrameworkServlet {
 				if (mappedHandler != null) {
 					mappedHandler.applyAfterConcurrentHandlingStarted(processedRequest, response);
 				}
+				asyncManager.setMultipartRequestParsed(multipartRequestParsed);
 			}
 			else {
 				// Clean up any resources used by a multipart request.
-				if (multipartRequestParsed) {
+				if (multipartRequestParsed || asyncManager.isMultipartRequestParsed()) {
 					cleanupMultipart(processedRequest);
 				}
 			}