svn commit: r1809141 - /tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java

[ma...@apache.org]

Author: markt
Date: Thu Sep 21 10:04:23 2017
New Revision: 1809141

URL: http://svn.apache.org/viewvc?rev=1809141&view=rev
Log:
performance:  do in-memory checks first and I/O performing ones later
kkolinko review

Modified:
    tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java

Modified: tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java?rev=1809141&r1=1809140&r2=1809141&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java Thu Sep 21 10:04:23 2017
@@ -61,7 +61,7 @@ public abstract class AbstractFileResour
         // If the requested names ends in '/', the Java File API will return a
         // matching file if one exists. This isn't what we want as it is not
         // consistent with the Servlet spec rules for request mapping.
-        if (file.isFile() && name.endsWith("/")) {
+        if (name.endsWith("/") && file.isFile()) {
             return null;
         }
 



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