Author: markt
Date: Thu Aug 9 14:04:21 2018
New Revision: 1837731
URL: http://svn.apache.org/viewvc?rev=1837731&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62607
Return a non-zero exit code from catalina.[bat|sh] run if Tomcat fails to start.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=1837731&r1=1837730&r2=1837731&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java Thu Aug 9
14:04:21 2018
@@ -490,11 +490,14 @@ public final class Bootstrap {
daemon.setAwait(true);
daemon.load(args);
daemon.start();
+ if (null == daemon.getServer()) {
+ System.exit(1);
+ }
} else if (command.equals("stop")) {
daemon.stopServer(args);
} else if (command.equals("configtest")) {
daemon.load(args);
- if (null==daemon.getServer()) {
+ if (null == daemon.getServer()) {
System.exit(1);
}
System.exit(0);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1837731&r1=1837730&r2=1837731&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Aug 9 14:04:21 2018
@@ -99,6 +99,10 @@
<bug>62560</bug>: Add <code>oraclepki.jar</code> to the list of JARs
ignored by <code>StandardJarScanner</code>. (markt)
</add>
+ <add>
+ <bug>62607</bug>: Return a non-zero exit code from
+ <code>catalina.[bat|sh] run</code> if Tomcat fails to start. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
