Return-Path: <costin@apache.org>
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 21647 invoked by uid 500); 1 Feb 2001 04:47:12 -0000
Delivered-To: apmail-jakarta-tomcat-cvs@apache.org
Received: (qmail 21644 invoked by uid 1052); 1 Feb 2001 04:47:12 -0000
Date: 1 Feb 2001 04:47:12 -0000
Message-ID: <20010201044712.21643.qmail@apache.org>
From: costin@apache.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core
 BaseInterceptor.java Container.java

costin      01/01/31 20:47:12

  Modified:    src/share/org/apache/tomcat/core BaseInterceptor.java
                        Container.java
  Log:
  Fix cut&paste bug, all modules were called to handleError instead of
  just the ones that implemented the hook.
  
  Added few comments in BaseInterceptor. ( related with the fix in ContextManager
  that will follow for startup order and war expansion )
  
  Revision  Changes    Path
  1.39      +8 -0      jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java
  
  Index: BaseInterceptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- BaseInterceptor.java	2001/01/28 19:49:19	1.38
  +++ BaseInterceptor.java	2001/02/01 04:47:12	1.39
  @@ -294,6 +294,9 @@
        *
        *  This hook will be called before the interceptor is initialized
        *  ( using engineInit hook )
  +     *
  +     *  An interceptor can add/remove other interceptors or applications,
  +     *  or alter the ordering of hooks, or change/set server properties.
        * 
        *  @param cm  the server
        *  @param ctx not null if this is a local interceptor
  @@ -344,12 +347,17 @@
       {
       }
   
  +    /** Notify that the server is ready and able to process requests
  +     */
       public  void engineStart(ContextManager cm )
   	throws TomcatException
       {
       }
       
   
  +    /** Notify that the server is disabled and shoulnd't process more
  +     * requests
  +     */
       public  void engineStop(ContextManager cm )
   	throws TomcatException
       {
  
  
  
  1.45      +1 -1      jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java
  
  Index: Container.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- Container.java	2001/01/01 00:17:23	1.44
  +++ Container.java	2001/02/01 04:47:12	1.45
  @@ -408,7 +408,7 @@
   	hooks.registerHook( "postService", H_postService );
   	hooks.registerHook( "postRequest", H_postRequest );
   	hooks.registerHook( "handleError", H_handleError );
  -	hooks.registerHook( "engineInit", H_handleError );
  +	hooks.registerHook( "engineInit", H_engineInit );
       }
   
       public Hooks getHooks() {