LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Nacharbeiten für Fix aus Revision 2085 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2095 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2013-03-18 10:19:55 +00:00
parent 25f1478b6b
commit 2a5d642762
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-core/src/com/arsdigita/globalization/ChainedResourceBundle.java
View File

@ -105,8 +105,10 @@ public class ChainedResourceBundle extends ResourceBundle {
* Because this particular bundle is just a wrapper around other bundles,
* this method will return null so that the ResourceBundle can then
* examine the values returned by the chained parents
* @param key
* @return
*/
public Object handleGetObject(String key) {
public Object handleGetObject(final String key) {
Iterator iter = m_bundles.iterator();
Object object = null;
while (iter.hasNext() && object == null) {

6
ccm-core/src/com/arsdigita/globalization/GlobalizedMessage.java
View File

@ -233,7 +233,7 @@ public class GlobalizedMessage {
throw new IllegalArgumentException("locale cannot be null.");
}
try {
try {
// jensp 2013-03-16:
// Previously, ResourceBundle#getBundle(String, Locale) was called here. That was causing problems under
// specific circumstances:
@ -253,8 +253,8 @@ public class GlobalizedMessage {
// with ResourceBundle.Control.getNoFallbackControl(List<String>).
resourceBundle = ResourceBundle.getBundle(
getBundleName(),
locale,
ResourceBundle.Control.getNoFallbackControl(ResourceBundle.Control.FORMAT_PROPERTIES));
locale,
ResourceBundle.Control.getNoFallbackControl(ResourceBundle.Control.FORMAT_DEFAULT));
} catch (MissingResourceException e) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(