Author: sohil.shah(a)jboss.com Date: 2008-10-23 01:30:32 -0400 (Thu, 23 Oct 2008) New Revision: 12143 Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSException.java branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java Log: minor bug fix. should go with the 2.6.7 tag along with the earlier commit Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSException.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSException.java 2008-10-23 03:16:20 UTC (rev 12142) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSException.java 2008-10-23 05:30:32 UTC (rev 12143) @@ -54,7 +54,7 @@ { boolean pathFormatFailure = false; - if(this.getMessage().indexOf("is not a legal path element")!=-1) + if(this.getMessage().indexOf("is not a legal path element")!=-1 || this.getMessage().indexOf("is not a valid path")!=-1) { pathFormatFailure = true; } Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-10-23 03:16:20 UTC (rev 12142) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-10-23 05:30:32 UTC (rev 12143) @@ -157,14 +157,9 @@ throws PortletException, IOException, UnavailableException { //SetUp the properly localized Date Formatter to be used by the View JSPs - Format dateFormat = (Format)rReq.getPortletSession().getAttribute(CMSAdminConstants.DATE_FORMAT); - if(dateFormat == null) - { - ResourceBundle bundle = this.getPortletConfig().getResourceBundle(rReq.getLocale()); - String datePattern = bundle.getString(CMSAdminConstants.CMS_DATE_PATTERN); - dateFormat = new SimpleDateFormat(datePattern, rReq.getLocale()); - rReq.getPortletSession().setAttribute(CMSAdminConstants.DATE_FORMAT, dateFormat); - } + ResourceBundle bundle = this.getPortletConfig().getResourceBundle(rReq.getLocale()); + String datePattern = bundle.getString(CMSAdminConstants.CMS_DATE_PATTERN); + Format dateFormat = new SimpleDateFormat(datePattern, rReq.getLocale()); rReq.setAttribute(CMSAdminConstants.DATE_FORMAT, dateFormat);