Author: markt
Date: Fri Nov 8 12:22:39 2013
New Revision: 1539996
URL: http://svn.apache.org/r1539996
Log:
Re-order tests to skip more expensive test when posisble
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=1539996&r1=1539995&r2=1539996&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
Fri Nov 8 12:22:39 2013
@@ -44,7 +44,7 @@ public abstract class AbstractFileResour
name = "";
}
File file = new File(fileBase, name);
- if (file.canRead() || !mustExist) {
+ if (!mustExist || file.canRead()) {
if (getRoot().getAllowLinking()) {
return file;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
