svn commit: r929521 - in /tomcat/trunk/java/org/apache/catalina/core: LocalStrings.properties StandardService.java

[markt]

Author: markt
Date: Wed Mar 31 13:06:30 2010
New Revision: 929521

URL: http://svn.apache.org/viewvc?rev=929521&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49030
Failure of one connector should not leave some connectors started and some 
ignored

Modified:
    tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/core/StandardService.java

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=929521&r1=929520&r2=929521&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Wed Mar 
31 13:06:30 2010
@@ -188,6 +188,7 @@ standardHost.validationEnabled=XML valid
 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}

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=929521&r1=929520&r2=929521&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Wed Mar 31 
13:06:30 2010
@@ -589,7 +589,13 @@ public class StandardService extends Lif
         // 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);
+                    }
                 }
         }
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org