remm 2005/02/16 13:14:36
Modified: catalina/src/share/org/apache/catalina/startup
HostConfig.java
Log:
- The XML should be added last in that case too.
Revision Changes Path
1.57 +4 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Index: HostConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- HostConfig.java 15 Feb 2005 16:19:21 -0000 1.56
+++ HostConfig.java 16 Feb 2005 21:14:36 -0000 1.57
@@ -638,15 +638,15 @@
deployedApp.redeployResources.put(warDocBase.getAbsolutePath(),
new Long(warDocBase.lastModified()));
}
- // Add the context XML to the list of files which
should trigger a redeployment
- deployedApp.redeployResources.put
- (contextXml.getAbsolutePath(), new
Long(contextXml.lastModified()));
if (expandedDocBase.exists()) {
deployedApp.redeployResources.put(expandedDocBase.getAbsolutePath(),
new
Long(expandedDocBase.lastModified()));
addWatchedResources(deployedApp,
expandedDocBase.getAbsolutePath(),
context);
}
+ // Add the context XML to the list of files which
should trigger a redeployment
+ deployedApp.redeployResources.put
+ (contextXml.getAbsolutePath(), new
Long(contextXml.lastModified()));
}
} else {
// Add the context XML to the list of files which should
trigger a redeployment
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
