Author: markt Date: Sun Jun 23 19:47:39 2013 New Revision: 1495880 URL: http://svn.apache.org/r1495880 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55125 No point starting a process if the Server container fails to start.
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java tomcat/trunk/java/org/apache/catalina/startup/Catalina.java tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties 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=1495880&r1=1495879&r2=1495880&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Sun Jun 23 19:47:39 2013 @@ -522,7 +522,11 @@ public class StandardService extends Lif } } - mapperListener.stop(); + // If the Server failed to start, the mapperListener won't have been + // started + if (mapperListener.getState() != LifecycleState.INITIALIZED) { + mapperListener.stop(); + } synchronized (executors) { for (Executor executor: executors) { Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1495880&r1=1495879&r2=1495880&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Sun Jun 23 19:47:39 2013 @@ -657,7 +657,13 @@ public class Catalina { try { getServer().start(); } catch (LifecycleException e) { - log.error("Catalina.start: ", e); + log.fatal(sm.getString("catalina.serverStartFail"), e); + try { + getServer().destroy(); + } catch (LifecycleException e1) { + log.debug("destroy() failed for failed Server ", e1); + } + return; } long t2 = System.nanoTime(); Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1495880&r1=1495879&r2=1495880&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Sun Jun 23 19:47:39 2013 @@ -15,6 +15,7 @@ catalina.configFail=Unable to load server configuration from [{0}] catalina.noCluster=Cluster RuleSet not found due to [{0}]. Cluster configuration disabled. +catalina.serverStartFail=The required Server component failed to start so Tomcat is unable to start. catalina.shutdownHookFail=The shutdown hook experienced an error while trying to stop the server catalina.stopServer=No shutdown port configured. Shut down server through OS signal. Server not shut down. catalina.stopServer.connectException=Could not contact {0}:{1}. Tomcat may not be running. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org