You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/05/14 14:02:30 UTC
svn commit: r1482312 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml
Author: markt
Date: Tue May 14 12:02:30 2013
New Revision: 1482312
URL: http://svn.apache.org/r1482312
Log:
Ensure HostConfig has the latest settings of copyXML, deployXML and unpackWARs before performing automatic deployment.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1482311
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1482312&r1=1482311&r2=1482312&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Tue May 14 12:02:30 2013
@@ -297,9 +297,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();
@@ -314,11 +311,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();
-
+ }
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1482312&r1=1482311&r2=1482312&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue May 14 12:02:30 2013
@@ -70,6 +70,10 @@
<code>JreMemoryLeakPreventionListener</code> would protect against this.
(markt)
</fix>
+ <fix>
+ Ensure that when auto deployment runs for a Host, it uses the latest
+ values for copyXML, deployXML and unpackWARs. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org