[portal-commits] JBoss Portal SVN: r9047 - in branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core: model/portal/metadata and 1 other directory.

Author: thomas.heute(a)jboss.com Date: 2007-11-20 13:25:24 -0500 (Tue, 20 Nov 2007) New Revision: 9047 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java Log: NPE are bad Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-11-20 18:11:57 UTC (rev 9046) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-11-20 18:25:24 UTC (rev 9047) @@ -154,6 +154,10 @@ public void setDisplayName(LocalizedString displayName) { + if (displayName == null) + { + throw new IllegalArgumentException("No null display name accepted"); + } displayNames = new HashMap(); Map map = displayName.getValues(); Iterator it = map.values().iterator(); Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java 2007-11-20 18:11:57 UTC (rev 9046) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java 2007-11-20 18:25:24 UTC (rev 9047) @@ -179,7 +179,10 @@ object.setListener(listener); // Configure display name - object.setDisplayName(displayName); + if (displayName != null) + { + object.setDisplayName(displayName); + } // Configure security SecurityConstraintsMetaData securityConstraints = getSecurityConstraints();