cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java

[craigmcc]

craigmcc    01/04/30 14:55:09

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardContext.java
  Log:
  A load-on-startup servlet that throws ServletException or
  UnavailableException from the init() method should *not* be fatal to the
  entire application -- only to that servlet.
  
  PR: Bugzilla #1557
  Submitted by: Greg Murray <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.56      +7 -5      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- StandardContext.java      2001/04/27 19:57:38     1.55
  +++ StandardContext.java      2001/04/30 21:55:07     1.56
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
 1.55 2001/04/27 19:57:38 remm Exp $
  - * $Revision: 1.55 $
  - * $Date: 2001/04/27 19:57:38 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
 1.56 2001/04/30 21:55:07 craigmcc Exp $
  + * $Revision: 1.56 $
  + * $Date: 2001/04/30 21:55:07 $
    *
    * ====================================================================
    *
  @@ -141,7 +141,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.55 $ $Date: 2001/04/27 19:57:38 $
  + * @version $Revision: 1.56 $ $Date: 2001/04/30 21:55:07 $
    */
   
   public class StandardContext
  @@ -3250,7 +3250,9 @@
                   } catch (ServletException e) {
                       log(sm.getString("standardWrapper.loadException",
                                        getName()), e);
  -                    ok = false;
  +                    // NOTE: load errors (including a servlet that throws
  +                    // UnavailableException from tht init() method) are NOT
  +                    // fatal to application startup
                   }
               }
           }