glenn       01/12/27 04:33:07

  Modified:    catalina/src/share/org/apache/catalina/startup Catalina.java
  Log:
  Remove the System.exit() I added
  
  Revision  Changes    Path
  1.45      +4 -9      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java
  
  Index: Catalina.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- Catalina.java     2001/12/26 11:00:55     1.44
  +++ Catalina.java     2001/12/27 12:33:07     1.45
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
 1.44 2001/12/26 11:00:55 glenn Exp $
  - * $Revision: 1.44 $
  - * $Date: 2001/12/26 11:00:55 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
 1.45 2001/12/27 12:33:07 glenn Exp $
  + * $Revision: 1.45 $
  + * $Date: 2001/12/27 12:33:07 $
    *
    * ====================================================================
    *
  @@ -97,7 +97,7 @@
    * </u>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.44 $ $Date: 2001/12/26 11:00:55 $
  + * @version $Revision: 1.45 $ $Date: 2001/12/27 12:33:07 $
    */
   
   public class Catalina {
  @@ -178,11 +178,6 @@
           } catch (Exception e) {
               e.printStackTrace(System.out);
           }
  -        // FIX ME ???, something changed recently causes the catalina java
  -        // process to hang at this point on shutdown unless there is an
  -        // explicit System.exit().  Could this have something to do with
  -        // the STM changes?
  -        System.exit(1);
       }
   
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to