Author: thomas.heute(a)jboss.com Date: 2007-10-26 11:17:29 -0400 (Fri, 26 Oct 2007) New Revision: 8779 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceDefinition.java Log: Oups Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceDefinition.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceDefinition.java 2007-10-26 12:51:04 UTC (rev 8778) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceDefinition.java 2007-10-26 15:17:29 UTC (rev 8779) @@ -87,7 +87,7 @@ this.mutable = false; this.portletRef = instanceMD.getPortletRef(); this.instanceId = instanceMD.getId(); - setDisplayNames(setDisplayNames(instanceMD.getDisplayName())); + this.displayNames = setDisplayNames(instanceMD.getDisplayName()); this.relatedSecurityBindings = new HashMap(); this.relatedCustomizations = new HashMap(); this.state = null; @@ -96,6 +96,10 @@ private Map setDisplayNames(LocalizedStringMetaData displayName) { Map map = new HashMap(); + if (displayName == null) + { + return map; + } for (int i = 0; i < displayName.getValues().size(); i++) { LocalizedValueMetaData descriptionMD = (LocalizedValueMetaData)displayName.getValues().get(i);