root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Be defensive about classloader in MessageSourceAutoConfiguration 

Fixes gh-1960
This commit is contained in:
Dave Syer 2014-11-20 12:28:33 +00:00
parent d0f43d2e2b
commit 12a7df6c40
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java
View File

@ -137,7 +137,7 @@ public class MessageSourceAutoConfiguration {
return new SkipPatternPathMatchingResourcePatternResolver(classLoader)
.getResources("classpath*:" + name + "*.properties");
}
catch (IOException ex) {
catch (Exception ex) {
return NO_RESOURCES;
}
}
@ -153,9 +153,14 @@ public class MessageSourceAutoConfiguration {
private static final ClassLoader ROOT_CLASSLOADER;
static {
ClassLoader classLoader = ClassLoader.getSystemClassLoader();
while (classLoader.getParent() != null) {
classLoader = classLoader.getParent();
ClassLoader classLoader = null;
try {
classLoader = ClassLoader.getSystemClassLoader();
while (classLoader.getParent() != null) {
classLoader = classLoader.getParent();
}
}
catch (Throwable e) {
}
ROOT_CLASSLOADER = classLoader;
}