From 9cb5f48459b13794846d57f6e5a7a6aa10ffcc7f Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Wed, 23 Apr 2014 18:18:46 +0200
Subject: [PATCH] SpringProperties falls back to ClassLoader.getSystemResource
 when loaded in bootstrap ClassLoader

Issue: SPR-11721
---
 .../main/java/org/springframework/core/SpringProperties.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/core/SpringProperties.java b/spring-core/src/main/java/org/springframework/core/SpringProperties.java
index 7e37951ca1..f0b25d6d3b 100644
--- a/spring-core/src/main/java/org/springframework/core/SpringProperties.java
+++ b/spring-core/src/main/java/org/springframework/core/SpringProperties.java
@@ -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();