Merge branch '5.2.x'

# Conflicts:
#	build.gradle

Author: jhoeller

build.gradle

@@ -95,7 +95,7 @@ configure(allprojects) { project ->
 			}
 
 			dependency "com.h2database:h2:1.4.200"
-			dependency "com.github.ben-manes.caffeine:caffeine:2.8.5"
+			dependency "com.github.ben-manes.caffeine:caffeine:2.8.6"
 			dependency "com.github.librepdf:openpdf:1.3.22"
 			dependency "com.rometools:rome:1.15.0"
 			dependency "commons-io:commons-io:2.5"

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

@@ -68,7 +68,7 @@ public RequestPartServletServerHttpRequest(HttpServletRequest request, String re
 		this.multipartRequest = MultipartResolutionDelegate.asMultipartHttpServletRequest(request);
 		this.requestPartName = requestPartName;
 
-		HttpHeaders multipartHeaders = this.multipartRequest.getMultipartHeaders(this.requestPartName);
+		HttpHeaders multipartHeaders = this.multipartRequest.getMultipartHeaders(requestPartName);
 		if (multipartHeaders == null) {
 			throw new MissingServletRequestPartException(requestPartName);
 		}