tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r652441 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Date Thu, 01 May 2008 07:00:15 GMT
Author: markt
Date: Thu May  1 00:00:14 2008
New Revision: 652441

URL: http://svn.apache.org/viewvc?rev=652441&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43142
If someone is daft enough to name their directory xxx.war, don't assume it is a war file.

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java

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=652441&r1=652440&r2=652441&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Thu May  1 00:00:14 2008
@@ -701,7 +701,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];



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message