From 177051d80c0ef5795a12ca180d382f2f9b78394c Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 2 Oct 2008 11:47:46 +0000 Subject: [PATCH] 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 --- java/org/apache/naming/resources/FileDirContext.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/java/org/apache/naming/resources/FileDirContext.java b/java/org/apache/naming/resources/FileDirContext.java index 743417dd4..58e54e46d 100644 --- 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); -- 2.11.0