cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core ContextManager.java

[costin]

costin      01/04/06 23:50:55

  Modified:    src/share/org/apache/tomcat/core ContextManager.java
  Log:
  Errors in shutdown will not stop the process, the rest of contexts
  and interceptors will be shut down.
  
  Revision  Changes    Path
  1.176     +10 -2     
jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
  
  Index: ContextManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
  retrieving revision 1.175
  retrieving revision 1.176
  diff -u -r1.175 -r1.176
  --- ContextManager.java       2001/03/25 21:53:13     1.175
  +++ ContextManager.java       2001/04/07 06:50:55     1.176
  @@ -578,12 +578,20 @@
       public final void shutdown() throws TomcatException {
           if( state==STATE_START ) stop();
        while (!contextsV.isEmpty()) {
  -         removeContext((Context)contextsV.firstElement());
  +         try {
  +             removeContext((Context)contextsV.firstElement());
  +         } catch(Exception ex ) {
  +             log( "shutdown.removeContext" , ex );
  +         }
        }
   
        BaseInterceptor cI[]=defaultContainer.getInterceptors();
        for( int i=0; i< cI.length; i++ ) {
  -         removeInterceptor( cI[i] );
  +         try {
  +             removeInterceptor( cI[i] );
  +         } catch( Exception ex ) {
  +             log( "shutdown.removeInterceptor" , ex );
  +         }
        }
       }