No need to call stop if the app didn't start
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Sat, 26 Feb 2011 20:07:00 +0000 (20:07 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Sat, 26 Feb 2011 20:07:00 +0000 (20:07 +0000)
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1074915 13f79535-47bb-0310-9956-ffa450edef68

java/org/apache/catalina/startup/HostConfig.java

index d3eaccb..2af28d9 100644 (file)
@@ -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);