Author: thomas.heute(a)jboss.com Date: 2007-12-10 11:32:14 -0500 (Mon, 10 Dec 2007) New Revision: 9331 Modified: tags/JBoss_Portal_2_6_3/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java Log: Doh ! Modified: tags/JBoss_Portal_2_6_3/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java =================================================================== --- tags/JBoss_Portal_2_6_3/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java 2007-12-10 15:57:53 UTC (rev 9330) +++ tags/JBoss_Portal_2_6_3/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java 2007-12-10 16:32:14 UTC (rev 9331) @@ -47,7 +47,15 @@ public PortletIconInfo getPortletIconInfo() { - return new PortletIconInfoImpl(portletApplicationContext, portletInfoMetaData.getPortletIcon()); + if (portletInfoMetaData.getPortletIcon() != null) + { + return new PortletIconInfoImpl(portletApplicationContext, portletInfoMetaData.getPortletIcon()); + } + else + { + return null; + } + } }