Revert this patch whilst I figure out why it breaks class loading.

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

diff --git a/java/org/apache/naming/resources/FileDirContext.java b/java/org/apache/naming/resources/FileDirContext.java
index 743417d..58e54e4 100644 (file)
--- a/java/org/apache/naming/resources/FileDirContext.java
+++ b/java/org/apache/naming/resources/FileDirContext.java
@@ -896,9 +896,7 @@ public class FileDirContext extends BaseDirContext {
 
         for (int i = 0; i < names.length; i++) {
 
-            File currentFile = file(file.getName() + "/" + names[i]);
-            if (currentFile == null) continue;
-
+            File currentFile = new File(file, names[i]);
             Object object = null;
             if (currentFile.isDirectory()) {
                 FileDirContext tempContext = new FileDirContext(env);