Author: chris.laprun(a)jboss.com
Date: 2007-06-29 16:23:10 -0400 (Fri, 29 Jun 2007)
New Revision: 7648
Modified:
trunk/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java
Log:
- JBPORTAL-1391: obsolete (line causing the exception has changed), however it was
probably caused due to a null portletApp.
Modified:
trunk/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java
===================================================================
---
trunk/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java 2007-06-29
13:46:03 UTC (rev 7647)
+++
trunk/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java 2007-06-29
20:23:10 UTC (rev 7648)
@@ -22,18 +22,18 @@
******************************************************************************/
package org.jboss.portal.portlet.impl.container;
-import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory;
-import org.jboss.portal.portlet.impl.jsr168.spi.PortletInfoFactory;
+import org.jboss.portal.portlet.container.PortletApplicationContext;
+import org.jboss.portal.portlet.container.PortletApplicationRegistrationContext;
+import org.jboss.portal.portlet.container.PortletApplicationRegistry;
+import org.jboss.portal.portlet.container.PortletContainer;
import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl;
import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl;
import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData;
import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData;
+import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory;
+import org.jboss.portal.portlet.impl.jsr168.spi.PortletInfoFactory;
import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
import org.jboss.portal.portlet.metadata.JBossPortletMetaData;
-import org.jboss.portal.portlet.container.PortletApplicationContext;
-import org.jboss.portal.portlet.container.PortletApplicationRegistry;
-import org.jboss.portal.portlet.container.PortletApplicationRegistrationContext;
-import org.jboss.portal.portlet.container.PortletContainer;
import javax.servlet.ServletContext;
import java.util.Iterator;
@@ -106,7 +106,7 @@
registrationContext = registry.registerPortletApplication(portletApp);
//
- for (Iterator i = portletAppMD.getPortlets().iterator();i.hasNext();)
+ for (Iterator i = portletAppMD.getPortlets().iterator(); i.hasNext();)
{
PortletMetaData portletMD = (PortletMetaData)i.next();
@@ -139,31 +139,35 @@
public void stopPortletApplication()
{
- for (Iterator i = portletApp.getPortletContainers().iterator();i.hasNext();)
+ // if the portlet application wasn't properly started, we shouldn't be
trying to stop it
+ if (portletApp != null)
{
- PortletContainerImpl container = (PortletContainerImpl)i.next();
- try
+ for (Iterator i = portletApp.getPortletContainers().iterator(); i.hasNext();)
{
- registrationContext.unregisterPortlet(container);
- container.stop();
+ PortletContainerImpl container = (PortletContainerImpl)i.next();
+ try
+ {
+ registrationContext.unregisterPortlet(container);
+ container.stop();
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+
+ //
+ portletApp.removeContainer(container);
+ container.setApplication(null);
}
- catch (Exception e)
- {
- e.printStackTrace();
- }
//
- portletApp.removeContainer(container);
- container.setApplication(null);
+ registry.unregisterPortletApplication(portletApp);
+ portletApp.stop();
+
+ //
+ portletApp = null;
+ registrationContext = null;
}
-
- //
- registry.unregisterPortletApplication(portletApp);
- portletApp.stop();
-
- //
- portletApp = null;
- registrationContext = null;
}
public void startPortletContainer(String portletName) throws Exception
Show replies by date