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:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
