Author: roy.russo(a)jboss.com Date: 2006-12-15 17:23:38 -0500 (Fri, 15 Dec 2006) New Revision: 5875 Modified: trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java Log: - fix null layout exception in dashboard Modified: trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java 2006-12-15 18:16:32 UTC (rev 5874) +++ trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java 2006-12-15 22:23:38 UTC (rev 5875) @@ -171,6 +171,10 @@ // Get the current layout and theme String layoutId = page.getDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT); + if (layoutId == null) + { + layoutId = page.getProperty(ThemeConstants.PORTAL_PROP_LAYOUT); + } PortalLayout currentLayout = layoutService.getLayout(layoutId, true); String themeId = page.getProperty(ThemeConstants.PORTAL_PROP_THEME);