Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 26535 invoked from network); 1 Oct 2008 14:24:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Oct 2008 14:24:04 -0000 Received: (qmail 13655 invoked by uid 500); 1 Oct 2008 14:24:00 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 13287 invoked by uid 500); 1 Oct 2008 14:23:59 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 13275 invoked by uid 99); 1 Oct 2008 14:23:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 07:23:59 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 14:23:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B809E238885D; Wed, 1 Oct 2008 07:23:09 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r700784 - /tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java Date: Wed, 01 Oct 2008 14:23:09 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081001142309.B809E238885D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Wed Oct 1 07:23:09 2008 New Revision: 700784 URL: http://svn.apache.org/viewvc?rev=700784&view=rev Log: 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 Modified: tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java Modified: tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=700784&r1=700783&r2=700784&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java (original) +++ tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java Wed Oct 1 07:23:09 2008 @@ -896,7 +896,9 @@ 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); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org