Author: markt
Date: Fri Sep 12 16:10:12 2014
New Revision: 1624581
URL: http://svn.apache.org/r1624581
Log:
Ensure web applications that have mixed case context paths and are deployed as
directories are correctly removed on undeploy when running on a case sensitive
file system.
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:r1624580
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=1624581&r1=1624580&r2=1624581&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 Fri
Sep 12 16:10:12 2014
@@ -1399,8 +1399,7 @@ public class HostConfig
// expanded WAR (if any)
Context context = (Context) host.findChild(app.name);
String docBase = context.getDocBase();
- docBase = docBase.toLowerCase(Locale.ENGLISH);
- if (!docBase.endsWith(".war")) {
+ if
(!docBase.toLowerCase(Locale.ENGLISH).endsWith(".war")) {
// This is an expanded directory
File docBaseFile = new File(docBase);
if (!docBaseFile.isAbsolute()) {
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=1624581&r1=1624580&r2=1624581&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Sep 12 16:10:12 2014
@@ -163,6 +163,11 @@
when web applications start. Includes contributions from kkolinko and
hzhang9. (markt)
</scode>
+ <fix>
+ <bug>56938</bug>: Ensure web applications that have mixed case context
+ paths and are deployed as directories are correctly removed on undeploy
+ when running on a case sensitive file system. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
