From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 15 Nov 2009 20:24:48 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47495
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=44dc53b2633b0b50c311a5652df44fd29f563e74;p=tomcat7.0

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47495
Exit immediately if Catalina.load() failed to create a server instance.

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

diff --git a/java/org/apache/catalina/startup/Catalina.java b/java/org/apache/catalina/startup/Catalina.java
index 31dd0d622..b284866e7 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -588,6 +588,11 @@ public class Catalina extends Embedded {
             load();
         }
 
+        if (server == null) {
+            log.fatal("Cannot start server. Server instance is not configured.");
+            return;
+        }
+
         long t1 = System.nanoTime();
         
         // Start the new server