root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '5.2.x' 

# Conflicts:
#	build.gradle
This commit is contained in:
Juergen Hoeller 2020-10-13 01:41:48 +02:00
parent e9cd37a4ee cd7e5f61f0
commit 379d9167d9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -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"

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

@ -68,7 +68,7 @@ public class RequestPartServletServerHttpRequest extends ServletServerHttpReques
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);
}