[portal-commits] JBoss Portal SVN: r9347 - branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui.

Author: chris.laprun(a)jboss.com Date: 2007-12-14 10:42:57 -0500 (Fri, 14 Dec 2007) New Revision: 9347 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java Log: - JBPORTAL-1843: Fixed NPE if there is no display name available. Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-12-14 15:23:52 UTC (rev 9346) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-12-14 15:42:57 UTC (rev 9347) @@ -214,7 +214,6 @@ }); instanceDecorator.setProperty("displayName", new InstanceDisplayNamePropertyDecorator()); registerDecorator(Instance.class, instanceDecorator); - // SimpleBeanDecorator portalObjectDecorator = new SimpleBeanDecorator() @@ -439,9 +438,16 @@ private String getValueForRequestLocale(LocalizedString string) { - FacesContext ctx = FacesContext.getCurrentInstance(); - Locale locale = ctx.getExternalContext().getRequestLocale(); - return string.getString(locale, true); + if (string != null) + { + FacesContext ctx = FacesContext.getCurrentInstance(); + Locale locale = ctx.getExternalContext().getRequestLocale(); + return string.getString(locale, true); + } + else + { + return null; + } } private static class PortletIconPropertyDecorator extends AbstractPropertyDecorator