Browse Source

Refine location checks for PathResource

This commit ensures that checks for PathResource locations are skipped
because this resource implementation will always resolve under the
current location.

Closes gh-34167
pull/34398/head
Brian Clozel 11 months ago
parent
commit
84be0d85b4
  1. 8
      spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceHandlerUtils.java
  2. 8
      spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHandlerUtils.java

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

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -24,6 +24,7 @@ import org.apache.commons.logging.Log; @@ -24,6 +24,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.PathResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource;
import org.springframework.core.log.LogFormatUtils;
@ -56,7 +57,10 @@ public abstract class ResourceHandlerUtils { @@ -56,7 +57,10 @@ public abstract class ResourceHandlerUtils {
Assert.notNull(location, "Resource location must not be null");
try {
String path;
if (location instanceof UrlResource) {
if (location instanceof PathResource) {
return;
}
else if (location instanceof UrlResource) {
path = location.getURL().toExternalForm();
}
else if (location instanceof ClassPathResource classPathResource) {

8
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHandlerUtils.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -24,6 +24,7 @@ import org.apache.commons.logging.Log; @@ -24,6 +24,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.PathResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource;
import org.springframework.core.log.LogFormatUtils;
@ -57,7 +58,10 @@ public abstract class ResourceHandlerUtils { @@ -57,7 +58,10 @@ public abstract class ResourceHandlerUtils {
Assert.notNull(location, "Resource location must not be null");
try {
String path;
if (location instanceof UrlResource) {
if (location instanceof PathResource) {
return;
}
else if (location instanceof UrlResource) {
path = location.getURL().toExternalForm();
}
else if (location instanceof ClassPathResource classPathResource) {

Loading…
Cancel
Save