Author: markt
Date: Sat Feb 26 20:07:00 2011
New Revision: 1074915
URL: http://svn.apache.org/viewvc?rev=1074915&view=rev
Log:
No need to call stop if the app didn't start
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1074915&r1=1074914&r2=1074915&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Sat Feb 26
20:07:00 2011
@@ -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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]