[portal-commits] JBoss Portal SVN: r13009 - branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/jboss.

[portal-commits at lists.jboss.org]

Author: mwringe
Date: 2009-03-10 01:36:16 -0400 (Tue, 10 Mar 2009)
New Revision: 13009

Modified:
   branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java
Log:
Need to catch potential NullPointerExceptions that can occur now that the ServerDeployer isn't being used for wars that contain portlets.

Modified: branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java	2009-03-10 05:34:19 UTC (rev 13008)
+++ branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java	2009-03-10 05:36:16 UTC (rev 13009)
@@ -232,8 +232,10 @@
    public void stop(DeploymentInfo di) throws DeploymentException
    {
       PortalDeploymentInfoContext pdiCtx = (PortalDeploymentInfoContext)infoContexts.get(di.url);
+      if (pdiCtx != null)
+      {
       pdiCtx.stop();
-
+      }
       //
       super.stop(di);
    }
@@ -241,8 +243,10 @@
    public void destroy(DeploymentInfo di) throws DeploymentException
    {
       PortalDeploymentInfoContext pdiCtx = (PortalDeploymentInfoContext)infoContexts.get(di.url);
+      if (pdiCtx != null)
+      {
       pdiCtx.destroy();
-
+      }
       //
       super.destroy(di);
    }