From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 26 Feb 2011 20:07:00 +0000 (+0000)
Subject: No need to call stop if the app didn't start
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=da36d2d20bbd444f1651d0052516ac917b45117b;p=tomcat7.0

No need to call stop if the app didn't start

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

diff --git a/java/org/apache/catalina/startup/HostConfig.java b/java/org/apache/catalina/startup/HostConfig.java
index d3eaccbc4..2af28d91d 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1248,7 +1248,10 @@ public class HostConfig
                     log.info(sm.getString("hostConfig.reload", app.name));
                 Container context = host.findChild(app.name);
                 try {
-                    context.stop();
+                    // Might not have started if start failed last time
+                    if (context.getState().isAvailable()) {
+                        context.stop();
+                    }
                 } catch (Exception e) {
                     log.warn(sm.getString
                              ("hostConfig.context.restart", app.name), e);