Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45403

When listing the resources for a collection, don't include invalid resources, particularly linked resources when allowLinking=false

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

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