Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv18464/basic
Modified Files:
State.java
Log Message:
that obviously was a bug, we try to avoid the locale == null, but then forgot
to set it.
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework/basic
Index: State.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/State.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- State.java 5 Jan 2009 18:53:23 -0000 1.11
+++ State.java 6 Jan 2009 15:37:26 -0000 1.12
@@ -25,7 +25,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: State.java,v 1.11 2009/01/05 18:53:23 michiel Exp $
+ * @version $Id: State.java,v 1.12 2009/01/06 15:37:26 michiel Exp $
* @since MMBase-1.9
*/
public class State {
@@ -161,10 +161,13 @@
String b = getBlock().getComponent().getBundle();
if (b != null) {
Locale locale = (Locale)
request.getAttribute("javax.servlet.jsp.jstl.fmt.locale.request");
- if (locale == null)
org.mmbase.module.core.MMBase.getMMBase().getLocale();
+ if (locale == null) {
+ locale = org.mmbase.module.core.MMBase.getMMBase().getLocale();
+ }
originalLocalizationContext =
request.getAttribute(Config.FMT_LOCALIZATION_CONTEXT + ".request");
+ ResourceBundle bundle = ResourceBundle.getBundle(b, locale);
request.setAttribute(Config.FMT_LOCALIZATION_CONTEXT + ".request",
- new
LocalizationContext(ResourceBundle.getBundle(b, locale), Locale.getDefault()));
+ new LocalizationContext(bundle,
Locale.getDefault()));
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
