Author: thomas.heute(a)jboss.com Date: 2008-01-24 03:39:03 -0500 (Thu, 24 Jan 2008) New Revision: 9595 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/metadata/InstanceMetaData.java Log: pwa can be null Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/metadata/InstanceMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/metadata/InstanceMetaData.java 2008-01-24 04:51:25 UTC (rev 9594) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/metadata/InstanceMetaData.java 2008-01-24 08:39:03 UTC (rev 9595) @@ -184,7 +184,7 @@ } // Set display name - if (localizedStringMD.getValues().isEmpty()) + if (localizedStringMD.getValues().isEmpty() && (pwa != null)) { ResourceBundleManager bundleMgr = MetaDataResourceBundleFactory.createResourceBundleManager(pwa.getClassLoader(), supportedLocales, resourceBundle); LocalizedString localizedString = bundleMgr.getLocalizedValue("org.jboss.portal.instance.name." + instanceName, instanceName);