From 12a7df6c40429005c000918709b506c193e6295c Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 20 Nov 2014 12:28:33 +0000 Subject: [PATCH] Be defensive about classloader in MessageSourceAutoConfiguration Fixes gh-1960 --- .../MessageSourceAutoConfiguration.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java index 301acdedd8..728b674910 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java @@ -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; }