Revert r701358 for https://issues.apache.org/bugzilla/show_bug.cgi?id=45403

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@804461 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/naming/resources/FileDirContext.java b/java/org/apache/naming/resources/FileDirContext.java
index 677a6ba..43958d4 100644 (file)
--- a/java/org/apache/naming/resources/FileDirContext.java
+++ b/java/org/apache/naming/resources/FileDirContext.java
@@ -773,15 +773,6 @@ public class FileDirContext extends BaseDirContext {
     protected File file(String name) {
 
         File file = new File(base, name);
-        return validate(file);
-
-    }
-
-
-    /*
-     * Check that the file is valid for this context
-     */
-    private File validate(File file) {
         if (file.exists() && file.canRead()) {
 
                if (allowLinking)
@@ -854,9 +845,7 @@ public class FileDirContext extends BaseDirContext {
 
         for (int i = 0; i < names.length; i++) {
 
-            File currentFile = validate(new File(file, names[i]));
-            if (currentFile == null) continue;
-            
+            File currentFile = new File(file, names[i]);
             Object object = null;
             if (currentFile.isDirectory()) {
                 FileDirContext tempContext = new FileDirContext(env);