Author: thomas.heute(a)jboss.com Date: 2008-08-21 08:14:50 -0400 (Thu, 21 Aug 2008) New Revision: 11724 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java Log: Fix NPE with WSRP instances Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-08-20 19:40:53 UTC (rev 11723) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-08-21 12:14:50 UTC (rev 11724) @@ -222,7 +222,7 @@ PortletInfo info = context.getPortletInfo(windowName); // - if (info.getEventing().getConsumedEvents().containsKey(event.getName())) + if (info.getEventing() != null && info.getEventing().getConsumedEvents().containsKey(event.getName())) { PortletWindowEvent distributedEvent = new PortletWindowEvent(event.getName(), event.getPayload(), windowName); windows.put(context.getWindow(windowName), distributedEvent); Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2008-08-20 19:40:53 UTC (rev 11723) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2008-08-21 12:14:50 UTC (rev 11724) @@ -50,6 +50,7 @@ import org.jboss.portal.portlet.info.EventInfo; import org.jboss.portal.portlet.info.MetaInfo; import org.jboss.portal.portlet.info.ModeInfo; +import org.jboss.portal.portlet.info.NavigationInfo; import org.jboss.portal.portlet.info.ParameterInfo; import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.info.WindowStateInfo; @@ -261,7 +262,14 @@ public Object getValue(Object bean) throws IllegalArgumentException { Portlet portlet = (Portlet)bean; - Collection<? extends ParameterInfo> pp = portlet.getInfo().getNavigation().getPublicParameters(); + + NavigationInfo navigationInfo = portlet.getInfo().getNavigation(); + if (navigationInfo == null) + { + return Collections.emptyList(); + } + + Collection<? extends ParameterInfo> pp = navigationInfo.getPublicParameters(); if (pp != null) { return new ArrayList<ParameterInfo>(pp);