Author: markt Date: Fri Sep 12 16:08:27 2014 New Revision: 1624580 URL: http://svn.apache.org/r1624580 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/trunk/java/org/apache/catalina/startup/HostConfig.java tomcat/trunk/webapps/docs/changelog.xml 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=1624580&r1=1624579&r2=1624580&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Fri Sep 12 16:08:27 2014 @@ -1223,8 +1223,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/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1624580&r1=1624579&r2=1624580&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Fri Sep 12 16:08:27 2014 @@ -143,6 +143,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