From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 9 Feb 2009 20:00:01 +0000 (+0000)
Subject: Only perform validation test when allowLinking is enabled
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d33f4b13b4fe93c975ae4d7894751c3e91f55108;p=tomcat7.0

Only perform validation test when allowLinking is enabled

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

diff --git a/java/org/apache/naming/resources/FileDirContext.java b/java/org/apache/naming/resources/FileDirContext.java
index 1bdd9dbe6..981c890d8 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 containg NamingEntry objects
+     * @return Vector containing NamingEntry objects
      */
     protected ArrayList<NamingEntry> list(File file) {
 
@@ -867,8 +867,11 @@ 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]);
+            if (allowLinking) {
+                currentFile = validate(currentFile);
+                if (currentFile == null) continue;
+            }
             
             Object object = null;
             if (currentFile.isDirectory()) {