Author: kkolinko
Date: Sun Nov 15 20:24:48 2009
New Revision: 836405
URL: http://svn.apache.org/viewvc?rev=836405&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47495
Exit immediately if Catalina.load() failed to create a server instance.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
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=836405&r1=836404&r2=836405&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Sun Nov 15
20:24:48 2009
@@ -588,6 +588,11 @@
load();
}
+ if (server == null) {
+ log.fatal("Cannot start server. Server instance is not
configured.");
+ return;
+ }
+
long t1 = System.nanoTime();
// Start the new server
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
