Author: markt
Date: Tue May 14 11:59:36 2013
New Revision: 1482311
URL: http://svn.apache.org/r1482311
Log:
Ensure HostConfig has the latest settings of copyXML, deployXML and unpackWARs
before performing automatic deployment.
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=1482311&r1=1482310&r2=1482311&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue May 14
11:59:36 2013
@@ -282,9 +282,6 @@ public class HostConfig
@Override
public void lifecycleEvent(LifecycleEvent event) {
- if (event.getType().equals(Lifecycle.PERIODIC_EVENT))
- check();
-
// Identify the host we are associated with
try {
host = (Host) event.getLifecycle();
@@ -299,11 +296,13 @@ public class HostConfig
}
// Process the event that has occurred
- if (event.getType().equals(Lifecycle.START_EVENT))
+ if (event.getType().equals(Lifecycle.PERIODIC_EVENT)) {
+ check();
+ } else if (event.getType().equals(Lifecycle.START_EVENT)) {
start();
- else if (event.getType().equals(Lifecycle.STOP_EVENT))
+ } else if (event.getType().equals(Lifecycle.STOP_EVENT)) {
stop();
-
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
