From d43d526b0a1b4eb080efb5cbe45b59fe0c2204e2 Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 9 Feb 2009 20:06:07 +0000 Subject: [PATCH] Revert previous patch. It won't work. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@742713 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/naming/resources/FileDirContext.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/java/org/apache/naming/resources/FileDirContext.java b/java/org/apache/naming/resources/FileDirContext.java index 981c890d8..1bdd9dbe6 100644 --- a/java/org/apache/naming/resources/FileDirContext.java +++ b/java/org/apache/naming/resources/FileDirContext.java @@ -846,7 +846,7 @@ public class FileDirContext extends BaseDirContext { * List the resources which are members of a collection. * * @param file Collection - * @return Vector containing NamingEntry objects + * @return Vector containg NamingEntry objects */ protected ArrayList list(File file) { @@ -867,11 +867,8 @@ public class FileDirContext extends BaseDirContext { for (int i = 0; i < names.length; i++) { - File currentFile = new File(file, names[i]); - if (allowLinking) { - currentFile = validate(currentFile); - if (currentFile == null) continue; - } + File currentFile = validate(new File(file, names[i])); + if (currentFile == null) continue; Object object = null; if (currentFile.isDirectory()) { -- 2.11.0