Return-Path: 
 <tomcat-dev-return-1757-qmlist-jakarta-archive-tomcat-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org
Received: (qmail 3135 invoked from network); 29 Nov 2001 17:35:51 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 29 Nov 2001 17:35:51 -0000
Received: (qmail 28522 invoked by uid 97); 29 Nov 2001 17:35:30 -0000
Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org
Received: (qmail 28487 invoked by uid 97); 29 Nov 2001 17:35:30 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:tomcat-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:tomcat-dev-help@jakarta.apache.org>
List-Post: <mailto:tomcat-dev@jakarta.apache.org>
List-Id: "Tomcat Developers List" <tomcat-dev.jakarta.apache.org>
Reply-To: "Tomcat Developers List" <tomcat-dev@jakarta.apache.org>
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 28447 invoked by uid 97); 29 Nov 2001 17:35:29 -0000
Date: 29 Nov 2001 17:18:10 -0000
Message-ID: <20011129171810.3139.qmail@icarus.apache.org>
From: patrickl@apache.org
To: jakarta-tomcat-4.0-cvs@apache.org
Subject: cvs commit:
 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup
 Catalina.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

patrickl    01/11/29 09:18:10

  Modified:    catalina/src/share/org/apache/catalina/startup Catalina.java
  Log:
  Fix for situation where an SSL connector is enabled but external dependencies (e.g. no .keystore file, etc.) are not correctly installed. Previous to this change, Tomcat would never invoke Lifecycle.start() if any connectors threw an exception. Hence, Tomcat appear to be hung.
  
  With this change, Tomcat will now properly start all connectors that are properly configured and won't get hung up by any improperly configured connectors.
  
  If desired, I can backport this change to the tomcat_40_branch for the upcoming 4.0.2 release.
  
  Revision  Changes    Path
  1.40      +13 -4     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.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- Catalina.java	2001/11/17 08:26:06	1.39
  +++ Catalina.java	2001/11/29 17:18:09	1.40
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v 1.39 2001/11/17 08:26:06 remm Exp $
  - * $Revision: 1.39 $
  - * $Date: 2001/11/17 08:26:06 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v 1.40 2001/11/29 17:18:09 patrickl Exp $
  + * $Revision: 1.40 $
  + * $Date: 2001/11/29 17:18:09 $
    *
    * ====================================================================
    *
  @@ -97,7 +97,7 @@
    * </u>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.39 $ $Date: 2001/11/17 08:26:06 $
  + * @version $Revision: 1.40 $ $Date: 2001/11/29 17:18:09 $
    */
   
   public class Catalina {
  @@ -494,6 +494,15 @@
           if (server instanceof Lifecycle) {
               try {
                   server.initialize();
  +            } catch (LifecycleException e) {
  +                System.out.println("Catalina.start: " + e);
  +                e.printStackTrace(System.out);
  +                if (e.getThrowable() != null) {
  +                    System.out.println("----- Root Cause -----");
  +                    e.getThrowable().printStackTrace(System.out);
  +                }
  +            }
  +            try {
                   ((Lifecycle) server).start();
               } catch (LifecycleException e) {
                   System.out.println("Catalina.start: " + e);
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>