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

Merge branch '6.2.x'

Browse Source 
# Conflicts:
#	spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceHandlerUtils.java
#	spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHandlerUtils.java
This commit is contained in:
Juergen Hoeller
2025-03-04 18:46:39 +01:00
parent ca7ebd60ed 403362fe3c
commit 2fbd54078b
8 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceHandlerUtils.java
View File

@@ -25,6 +25,7 @@ import org.apache.commons.logging.LogFactory;
import org.jspecify.annotations.Nullable;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource;
import org.springframework.core.log.LogFormatUtils;
@@ -60,12 +61,15 @@ public abstract class ResourceHandlerUtils {
if (location instanceof org.springframework.core.io.PathResource) {
return;
}
else if (location instanceof UrlResource) {
path = location.getURL().toExternalForm();
else if (location instanceof FileSystemResource fileSystemResource) {
path = fileSystemResource.getPath();
}
else if (location instanceof ClassPathResource classPathResource) {
path = classPathResource.getPath();
}
else if (location instanceof UrlResource) {
path = location.getURL().toExternalForm();
}
else {
path = location.getURL().getPath();
}