Skip to content

Commit 9cb5f48

Browse files
committed
SpringProperties falls back to ClassLoader.getSystemResource when loaded in bootstrap ClassLoader
Issue: SPR-11721
1 parent 794e859 commit 9cb5f48

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

spring-core/src/main/java/org/springframework/core/SpringProperties.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ public abstract class SpringProperties {
5555
static {
5656
try {
5757
ClassLoader cl = SpringProperties.class.getClassLoader();
58-
URL url = cl.getResource(PROPERTIES_RESOURCE_LOCATION);
58+
URL url = (cl != null ? cl.getResource(PROPERTIES_RESOURCE_LOCATION) :
59+
ClassLoader.getSystemResource(PROPERTIES_RESOURCE_LOCATION));
5960
if (url != null) {
6061
logger.info("Found 'spring.properties' file in local classpath");
6162
InputStream is = url.openStream();

0 commit comments

Comments
 (0)