Author: thomas.heute(a)jboss.com
Date: 2007-03-14 07:46:07 -0400 (Wed, 14 Mar 2007)
New Revision: 6662
Modified:
branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
Log:
preserveDataModel on the properties broke the management portlet
Modified:
branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-03-14
05:34:40 UTC (rev 6661)
+++
branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-03-14
11:46:07 UTC (rev 6662)
@@ -315,10 +315,13 @@
//return selectedProperties;
PortalObject object = getSelectedObject();
List properties = new ArrayList();
- for (Iterator i = object.getDeclaredPropertyMap().entrySet().iterator();
i.hasNext();)
+ if (object != null)
{
- Map.Entry entry = (Map.Entry)i.next();
- properties.add(new String[]{(String)entry.getKey(), (String)entry.getValue()});
+ for (Iterator i = object.getDeclaredPropertyMap().entrySet().iterator();
i.hasNext();)
+ {
+ Map.Entry entry = (Map.Entry)i.next();
+ properties.add(new String[]{(String)entry.getKey(),
(String)entry.getValue()});
+ }
}
return properties;
}
Show replies by date