Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.3.x' into main

Browse Source
This commit is contained in:
Rossen Stoyanchev
2021-10-12 12:00:55 +01:00
parent 87cb84b832 a2c52a97ba
commit 7957b9cc0f
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
View File

@@ -25,6 +25,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.stream.Collectors;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
@@ -423,6 +424,7 @@ public class ResourceHttpRequestHandler extends WebContentGenerator
}
private void resolveResourceLocations() {
List<Resource> result = new ArrayList<>();
if (!this.locationValues.isEmpty()) {
ApplicationContext applicationContext = obtainApplicationContext();
for (String location : this.locationValues) {
@@ -451,7 +453,7 @@ public class ResourceHttpRequestHandler extends WebContentGenerator
"but resolved to a Resource of type: " + resource.getClass() + ". " +
"If this is intentional, please pass it as a pre-configured Resource via setLocations.");
}
this.locationsToUse.add(resource);
result.add(resource);
if (charset != null) {
if (!(resource instanceof UrlResource)) {
throw new IllegalArgumentException("Unexpected charset for non-UrlResource: " + resource);
@@ -460,7 +462,11 @@ public class ResourceHttpRequestHandler extends WebContentGenerator
}
}
}
this.locationsToUse.addAll(this.locationResources);
result.addAll(this.locationResources);
result = result.stream().filter(Resource::exists).collect(Collectors.toList());
this.locationsToUse.addAll(result);
}
/**