Author: markt Date: Thu Sep 28 17:20:38 2017 New Revision: 1810014 URL: http://svn.apache.org/viewvc?rev=1810014&view=rev Log: Tab police
Modified: tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=1810014&r1=1810013&r2=1810014&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java Thu Sep 28 17:20:38 2017 @@ -810,7 +810,7 @@ public class FileDirContext extends Base protected File validate(File file, String name, boolean mustExist, String absoluteBase, - String canonicalBase) { + String canonicalBase) { // 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 Modified: tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java?rev=1810014&r1=1810013&r2=1810014&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java Thu Sep 28 17:20:38 2017 @@ -330,9 +330,9 @@ public class VirtualDirContext extends F return null; } } - - + + protected File validate(File file, String name, boolean mustExist, String absoluteBase) { - return validate(file, name, mustExist, normalize(absoluteBase), absoluteBase); + return validate(file, name, mustExist, normalize(absoluteBase), absoluteBase); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org