[jboss-cvs] jboss-system/src/main/org/jboss/deployment ...

[Scott S. <sco...@jb...>]

  User: starksm 
  Date: 05/06/25 14:53:30

  Modified:    src/main/org/jboss/deployment  MainDeployer.java
  Log:
  Guard against NPEs during shutdown by validating the server ivar before executing deploy.
  
  Revision  Changes    Path
  1.80      +6 -3      jboss-system/src/main/org/jboss/deployment/MainDeployer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MainDeployer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-system/src/main/org/jboss/deployment/MainDeployer.java,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -b -r1.79 -r1.80
  --- MainDeployer.java	14 Jun 2005 23:30:30 -0000	1.79
  +++ MainDeployer.java	25 Jun 2005 18:53:30 -0000	1.80
  @@ -58,7 +58,7 @@
    * @author <a href="mailto:sco...@jb...">Scott Stark</a>
    * @author <a href="mailto:d_j...@us...">David Jencks</a>
    * @author <a href="mailto:dim...@jb...">Dimitris Andreadis</a>
  - * @version $Revision: 1.79 $
  + * @version $Revision: 1.80 $
    *
    * @jmx.mbean name="jboss.system:service=MainDeployer"
    *  extends="org.jboss.system.ServiceMBean, org.jboss.deployment.DeployerMBean, org.jboss.deployment.MainDeployerConstants"
  @@ -708,6 +708,9 @@
      public void deploy(String urlspec)
         throws DeploymentException, MalformedURLException
      {
  +      if( server == null )
  +         throw new DeploymentException("The MainDeployer has been unregistered");
  +
         URL url;
         try
         {
  @@ -925,7 +928,7 @@
               }
               catch (Throwable t)
               {
  -               log.error("could not create deployment: " + deployment.url, t);
  +               log.error("Could not create deployment: " + deployment.url, t);
                  throw t;
               }
            }
  @@ -982,7 +985,7 @@
               }
               catch (Throwable t)
               {
  -               log.error("could not start deployment: " + deployment.url, t);
  +               log.error("Could not start deployment: " + deployment.url, t);
                  throw t;
               }
            }