From 2a5d642762d8cff483897a7560c9046fdbafbc12 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 18 Mar 2013 10:19:55 +0000
Subject: [PATCH] =?UTF-8?q?Nacharbeiten=20f=C3=BCr=20Fix=20aus=20Revision?=
 =?UTF-8?q?=202085?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@2095 8810af33-2d31-482b-a856-94f89814c4df
---
 .../com/arsdigita/globalization/ChainedResourceBundle.java  | 4 +++-
 .../src/com/arsdigita/globalization/GlobalizedMessage.java  | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ccm-core/src/com/arsdigita/globalization/ChainedResourceBundle.java b/ccm-core/src/com/arsdigita/globalization/ChainedResourceBundle.java
index 4847c6472..ad1855cf2 100755
--- a/ccm-core/src/com/arsdigita/globalization/ChainedResourceBundle.java
+++ b/ccm-core/src/com/arsdigita/globalization/ChainedResourceBundle.java
@@ -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) {
diff --git a/ccm-core/src/com/arsdigita/globalization/GlobalizedMessage.java b/ccm-core/src/com/arsdigita/globalization/GlobalizedMessage.java
index 3a3e98b2b..be90460f0 100755
--- a/ccm-core/src/com/arsdigita/globalization/GlobalizedMessage.java
+++ b/ccm-core/src/com/arsdigita/globalization/GlobalizedMessage.java
@@ -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(