[jboss-cvs] contrib/jetty/src/main/org/jboss/jetty Jetty.java

[Scott M S. <st...@us...>]

  User: starksm 
  Date: 02/05/26 16:50:03

  Modified:    jetty/src/main/org/jboss/jetty Tag: Branch_3_0 Jetty.java
  Log:
  Guard against NPE in stop when asked to undeploy a failed deployment
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.46.2.3  +7 -5      contrib/jetty/src/main/org/jboss/jetty/Jetty.java
  
  Index: Jetty.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/Jetty.java,v
  retrieving revision 1.46.2.2
  retrieving revision 1.46.2.3
  diff -u -r1.46.2.2 -r1.46.2.3
  --- Jetty.java	10 May 2002 02:23:57 -0000	1.46.2.2
  +++ Jetty.java	26 May 2002 23:50:03 -0000	1.46.2.3
  @@ -5,7 +5,7 @@
    * See terms of license at gnu.org.
    */
   
  -// $Id: Jetty.java,v 1.46.2.2 2002/05/10 02:23:57 user57 Exp $
  +// $Id: Jetty.java,v 1.46.2.3 2002/05/26 23:50:03 starksm Exp $
   
   // A Jetty HttpServer with the interface expected by JBoss'
   // J2EEDeployer...
  @@ -50,7 +50,7 @@
    *
    * @author <a href="mailto:jules_gosnell@yahoo..com">Julian Gosnell</a>
    * @author  <a href="mailto:an...@jb...">Andreas Schaefer</a>.
  - * @version $Revision: 1.46.2.2 $
  + * @version $Revision: 1.46.2.3 $
    *
    * <p><b>Revisions:</b>
    *
  @@ -435,9 +435,11 @@
   
       try
       {
  -      app.stop();
  -
  -      removeContext(app);
  +       if( app != null )
  +       {
  +         app.stop();
  +         removeContext(app);
  +       }
         //      app.destroy();
         app=null;