Author: kfujino
Date: Thu Oct 16 07:56:50 2014
New Revision: 1632229
URL: http://svn.apache.org/r1632229
Log:
Remove the unnecessary registration of context.xml as a redeploy resource.
The context.xml having an external docBase has already been registered as a
redeploy resource at first.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
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=1632229&r1=1632228&r2=1632229&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 Thu
Oct 16 07:56:50 2014
@@ -700,8 +700,6 @@ public class HostConfig
if (isExternalWar && unpackWARs) {
deployedApp.redeployResources.put(expandedDocBase.getAbsolutePath(),
Long.valueOf(expandedDocBase.lastModified()));
- deployedApp.redeployResources.put(contextXml.getAbsolutePath(),
- Long.valueOf(contextXml.lastModified()));
addWatchedResources(deployedApp,
expandedDocBase.getAbsolutePath(), context);
} else {
// Find an existing matching war and expanded folder
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=1632229&r1=1632228&r2=1632229&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct 16 07:56:50 2014
@@ -67,6 +67,11 @@
Correct a couple of NPEs in the JNDI Realm that could be triggered with
when not specifying a roleBase and enabling roleSearchAsUser. (markt)
</fix>
+ <fix>
+ Remove the unnecessary registration of context.xml as a redeploy
+ resource. The context.xml having an external docBase has already been
+ registered as a redeploy resources at first. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
