Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49030

Failure of one connector should not leave some connectors started and some ignored

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@929521 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/LocalStrings.properties b/java/org/apache/catalina/core/LocalStrings.properties
index 60226b4..ddabbdf 100644 (file)
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -188,6 +188,7 @@ standardHost.validationEnabled=XML validation enabled
 standardHost.validationDisabled=XML validation disabled
 standardServer.initialize.initialized=This server has already been initialized
 standardServer.shutdownViaPort=A valid shutdown command was received via the shutdown port. Stopping the Server instance.
+standardService.connector.failed=Failed to start connector [{0}]
 standardService.initialize.initialized=This service has already been initialized
 standardService.initialize.failed=Service initializing at {0} failed
 standardService.register.failed=Error registering Service at domain {0}

diff --git a/java/org/apache/catalina/core/StandardService.java b/java/org/apache/catalina/core/StandardService.java
index 160b884..95656c1 100644 (file)
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -589,7 +589,13 @@ public class StandardService extends LifecycleBase
         // Initialize our defined Connectors
         synchronized (connectors) {
                 for (int i = 0; i < connectors.length; i++) {
-                    connectors[i].initialize();
+                    try {
+                        connectors[i].initialize();
+                    } catch (Exception e) {
+                        log.error(sm.getString(
+                                "standardService.connector.failed",
+                                connectors[i]), e);
+                    }
                 }
         }
     }