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