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

Merge branch '2.4.x'

This commit is contained in:
Phillip Webb 2021-01-11 13:40:32 -08:00
parent 3301f6b6ee cff3e4c831
commit 3fc1d319fe
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java
View File

@ -1041,7 +1041,7 @@ class WebMvcAutoConfigurationTests {
protected Map<String, List<Resource>> getMappingLocations(HandlerMapping mapping) { protected Map<String, List<Resource>> getMappingLocations(HandlerMapping mapping) {
Map<String, List<Resource>> mappingLocations = new LinkedHashMap<>(); Map<String, List<Resource>> mappingLocations = new LinkedHashMap<>();
getHandlerMap(mapping).forEach((key, value) -> { getHandlerMap(mapping).forEach((key, value) -> {
Object locations = ReflectionTestUtils.getField(value, "locations"); Object locations = ReflectionTestUtils.getField(value, "locationsToUse");
mappingLocations.put(key, (List<Resource>) locations); mappingLocations.put(key, (List<Resource>) locations);
}); });
return mappingLocations; return mappingLocations;