File tree 2 files changed +12
-4
lines changed
spring-webflux/src/main/java/org/springframework/web/reactive/resource
spring-webmvc/src/main/java/org/springframework/web/servlet/resource
2 files changed +12
-4
lines changed Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2002-2024 the original author or authors.
2
+ * Copyright 2002-2025 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
24
24
import org .apache .commons .logging .LogFactory ;
25
25
26
26
import org .springframework .core .io .ClassPathResource ;
27
+ import org .springframework .core .io .PathResource ;
27
28
import org .springframework .core .io .Resource ;
28
29
import org .springframework .core .io .UrlResource ;
29
30
import org .springframework .core .log .LogFormatUtils ;
@@ -56,7 +57,10 @@ public static void assertResourceLocation(@Nullable Resource location) {
56
57
Assert .notNull (location , "Resource location must not be null" );
57
58
try {
58
59
String path ;
59
- if (location instanceof UrlResource ) {
60
+ if (location instanceof PathResource ) {
61
+ return ;
62
+ }
63
+ else if (location instanceof UrlResource ) {
60
64
path = location .getURL ().toExternalForm ();
61
65
}
62
66
else if (location instanceof ClassPathResource classPathResource ) {
Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2002-2024 the original author or authors.
2
+ * Copyright 2002-2025 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
24
24
import org .apache .commons .logging .LogFactory ;
25
25
26
26
import org .springframework .core .io .ClassPathResource ;
27
+ import org .springframework .core .io .PathResource ;
27
28
import org .springframework .core .io .Resource ;
28
29
import org .springframework .core .io .UrlResource ;
29
30
import org .springframework .core .log .LogFormatUtils ;
@@ -57,7 +58,10 @@ public static void assertResourceLocation(@Nullable Resource location) {
57
58
Assert .notNull (location , "Resource location must not be null" );
58
59
try {
59
60
String path ;
60
- if (location instanceof UrlResource ) {
61
+ if (location instanceof PathResource ) {
62
+ return ;
63
+ }
64
+ else if (location instanceof UrlResource ) {
61
65
path = location .getURL ().toExternalForm ();
62
66
}
63
67
else if (location instanceof ClassPathResource classPathResource ) {
You can’t perform that action at this time.
0 commit comments