[portal-commits] JBoss Portal SVN: r9130 - branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard.
Author: emuckenhuber
Date: 2007-11-27 11:55:27 -0500 (Tue, 27 Nov 2007)
New Revision: 9130
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java
Log:
fixing NPE when deleting a page on the dashboard
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2007-11-27
16:37:49 UTC (rev 9129)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2007-11-27
16:55:27 UTC (rev 9130)
@@ -112,7 +112,7 @@
private void refresh()
{
- // Create page manager if it doees not exit
+ // Create page manager if it does not exit
if (pageManager == null)
{
pageManager = new PageManagerBean(layoutService, new
PortletDefinitionInvoker(instanceContainer));
@@ -129,7 +129,7 @@
return;
}
- // Page for editting
+ // Page for editing
if (selectedPageName != null)
{
pageManager.page = userPortal.getPage(selectedPageName);
@@ -147,7 +147,7 @@
defaultPageName = PortalObject.DEFAULT_OBJECT_NAME;
}
selectePageIsDefault = selectedPageName.equals(defaultPageName);
-
+
//
Collection pages = userPortal.getChildren(PortalObject.PAGE_MASK);
pageItems = new SelectItem[pages.size()];
@@ -198,7 +198,14 @@
try
{
userPortal.destroyChild(selectedPageName);
- selectedPageName = null;
+
+ // Fallback to default page
+ String defaultPageName =
pageManager.page.getProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME);
+ if (defaultPageName == null)
+ {
+ defaultPageName = PortalObject.DEFAULT_OBJECT_NAME;
+ }
+ selectedPageName = defaultPageName;
}
catch (NoSuchPortalObjectException e)
{