Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/org/jahia/portlet/jforum
In directory james.mmbase.org:/tmp/cvs-serv3100/java/org/jahia/portlet/jforum
Modified Files:
Tag: b1_5
JForumPortletBridge.java
Log Message:
CMSC-1104 JForum portlet does not work on test environment
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/org/jahia/portlet/jforum
See also: http://www.mmbase.org/jira/browse/CMSC-1104
Index: JForumPortletBridge.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/org/jahia/portlet/jforum/JForumPortletBridge.java,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -b -r1.6.2.3 -r1.6.2.4
--- JForumPortletBridge.java 23 Mar 2009 06:01:00 -0000 1.6.2.3
+++ JForumPortletBridge.java 26 Mar 2009 02:38:57 -0000 1.6.2.4
@@ -497,7 +497,7 @@
String language = "en_US";
String charset =
(String)request.getPortletSession().getAttribute("javax.servlet.jsp.jstl.fmt.request.charset");
- if(!locale.getLanguage().equals("en") &&
StringUtils.isEmpty(locale.getCountry())) {
+ if(locale != null && !locale.getLanguage().equals("en") &&
StringUtils.isEmpty(locale.getCountry())) {
locale = Locale.getDefault();
language = locale.getLanguage()+"_"+locale.getCountry();
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
