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

Author: thomas.heute(a)jboss.com Date: 2007-11-14 09:27:33 -0500 (Wed, 14 Nov 2007) New Revision: 8924 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceDefinition.java Log: Minor Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2007-11-14 14:26:07 UTC (rev 8923) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2007-11-14 14:27:33 UTC (rev 8924) @@ -186,9 +186,17 @@ displayNameKey = RESOURCE_PREFIX + object.getName(); } - // Try to get the display name from the resource bundles + // Try to get the display name from the resource bundles for backward compatibility String displayName = null; - ResourceBundle bundle = resourceBundles.getResourceBundle(locale); + ResourceBundle bundle = null; + try + { + bundle = resourceBundles.getResourceBundle(locale); + } + catch (MissingResourceException ignore) + { + } + if (bundle != null) { try 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-11-14 14:26:07 UTC (rev 8923) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceDefinition.java 2007-11-14 14:27:33 UTC (rev 8924) @@ -78,6 +78,7 @@ this.instanceId = id; this.relatedSecurityBindings = new HashMap(); this.relatedCustomizations = new HashMap(); + this.displayNames = new HashMap(); this.state = null; } @@ -90,6 +91,7 @@ this.displayNames = setDisplayNames(instanceMD.getDisplayName()); this.relatedSecurityBindings = new HashMap(); this.relatedCustomizations = new HashMap(); + this.displayNames = new HashMap(); this.state = null; }