From c83cf12fdbbdddc8d7c9e2f1a5b9452aa06daca0 Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 1 Oct 2008 14:23:09 +0000 Subject: [PATCH] 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 --- java/org/apache/naming/resources/FileDirContext.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/org/apache/naming/resources/FileDirContext.java b/java/org/apache/naming/resources/FileDirContext.java index 58e54e46d..743417dd4 100644 --- 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); -- 2.11.0