Browse Source

SpringProperties falls back to ClassLoader.getSystemResource when loaded in bootstrap ClassLoader

Issue: SPR-11721
pull/529/head
Juergen Hoeller 12 years ago
parent
commit
9cb5f48459
  1. 3
      spring-core/src/main/java/org/springframework/core/SpringProperties.java

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

@ -55,7 +55,8 @@ public abstract class SpringProperties { @@ -55,7 +55,8 @@ public abstract class SpringProperties {
static {
try {
ClassLoader cl = SpringProperties.class.getClassLoader();
URL url = cl.getResource(PROPERTIES_RESOURCE_LOCATION);
URL url = (cl != null ? cl.getResource(PROPERTIES_RESOURCE_LOCATION) :
ClassLoader.getSystemResource(PROPERTIES_RESOURCE_LOCATION));
if (url != null) {
logger.info("Found 'spring.properties' file in local classpath");
InputStream is = url.openStream();

Loading…
Cancel
Save