Author: markt Date: Thu May 1 13:57:28 2008 New Revision: 652659 URL: http://svn.apache.org/viewvc?rev=652659&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43142 Don't assume a directory named xxx.war is a war file
Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=652659&r1=652658&r2=652659&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 13:57:28 2008 @@ -80,9 +80,3 @@ http://svn.apache.org/viewvc?rev=651792&view=rev +1: billbarker, markt, remm, fhanik -1: - -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43142 - Don't assume a directory named xxx.war is a war file - http://svn.apache.org/viewvc?rev=652441&view=rev - +1: markt, remm, fhanik - -1: Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=652659&r1=652658&r2=652659&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Thu May 1 13:57:28 2008 @@ -700,7 +700,7 @@ if (files[i].equalsIgnoreCase("WEB-INF")) continue; File dir = new File(appBase, files[i]); - if (files[i].toLowerCase().endsWith(".war")) { + if (files[i].toLowerCase().endsWith(".war") && dir.isFile()) { // Calculate the context path and make sure it is unique String contextPath = "/" + files[i]; Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=652659&r1=652658&r2=652659&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May 1 13:57:28 2008 @@ -40,6 +40,10 @@ using the webapp class loader when we create them. (markt) </fix> <fix> + <bug>43142</bug>: Don't assume a directory named xxx.war is a war file. + (markt) + </fix> + <fix> <bug>43425</bug>: Make annotations spec compliant. Patch provided by Dain Sundstrom. (markt) </fix> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]