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

Avoid custom ResourceBundle.Control on Jigsaw (as far as possible) 

Issue: SPR-16776
This commit is contained in:
Juergen Hoeller 2018-04-27 18:24:31 +02:00
parent eaff2c28a7
commit d5aedac6db
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spring-context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java
View File

@ -220,7 +220,25 @@ public class ResourceBundleMessageSource extends AbstractResourceBasedMessageSou
protected ResourceBundle doGetBundle(String basename, Locale locale) throws MissingResourceException { protected ResourceBundle doGetBundle(String basename, Locale locale) throws MissingResourceException {
ClassLoader classLoader = getBundleClassLoader(); ClassLoader classLoader = getBundleClassLoader();
Assert.state(classLoader != null, "No bundle ClassLoader set"); Assert.state(classLoader != null, "No bundle ClassLoader set");
return ResourceBundle.getBundle(basename, locale, classLoader, new MessageSourceControl()); String defaultEncoding = getDefaultEncoding();
if ((defaultEncoding != null && !"ISO-8859-1".equals(defaultEncoding)) ||
!isFallbackToSystemLocale() || getCacheMillis() >= 0) {
try {
return ResourceBundle.getBundle(basename, locale, classLoader, new MessageSourceControl());
}
catch (UnsupportedOperationException ex) {
// Probably in a Jigsaw environment on JDK 9+
throw new IllegalStateException(
"Custom ResourceBundleMessageSource configuration requires custom ResourceBundle.Control " +
"which is not supported in current system environment (e.g. JDK 9+ module path deployment): " +
"consider using defaults (ISO-8859-1 encoding, fallback to system locale, unlimited caching)",
ex);
}
}
else {
return ResourceBundle.getBundle(basename, locale, classLoader);
}
} }
/** /**