Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 64017 invoked from network); 12 Feb 2008 16:14:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Feb 2008 16:14:33 -0000 Received: (qmail 32170 invoked by uid 500); 12 Feb 2008 16:14:23 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 31965 invoked by uid 500); 12 Feb 2008 16:14:23 -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 31954 invoked by uid 500); 12 Feb 2008 16:14:23 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 31951 invoked by uid 99); 12 Feb 2008 16:14:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Feb 2008 08:14:23 -0800 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.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Feb 2008 16:13:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 376B21A9832; Tue, 12 Feb 2008 08:14:06 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r620842 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/servlets/DefaultServlet.java webapps/docs/changelog.xml Date: Tue, 12 Feb 2008 16:13:58 -0000 To: tomcat-dev@jakarta.apache.org From: funkman@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080212161406.376B21A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: funkman Date: Tue Feb 12 08:13:54 2008 New Revision: 620842 URL: http://svn.apache.org/viewvc?rev=620842&view=rev Log: Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44337 Dir listing crashes if no readme-file present Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=620842&r1=620841&r2=620842&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 12 08:13:54 2008 @@ -70,12 +70,6 @@ +0: remm: do we really want to fix these sort of "bugs" ? -1: -* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44337 - Dir listing crashes if no readme-file present - http://svn.apache.org/viewvc?rev=618150&view=rev - +1: funkman, markt, fhanik, pero - -1: - * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43741 Correctly handle dependencies on tags in JARs http://svn.apache.org/viewvc?rev=618481&view=rev Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=620842&r1=620841&r2=620842&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Tue Feb 12 08:13:54 2008 @@ -1415,7 +1415,10 @@ return buffer.toString(); } } catch (NamingException e) { - throw new ServletException("Error opening readme resource", e); + if (debug > 10) + log("readme '" + readmeFile + "' not found", e); + + return null; } } @@ -1438,7 +1441,10 @@ return is; } } catch (NamingException e) { - throw new ServletException("Error opening XSLT resource", e); + if (debug > 10) + log("localXsltFile '" + localXsltFile + "' not found", e); + + return null; } } Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=620842&r1=620841&r2=620842&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Feb 12 08:13:54 2008 @@ -32,6 +32,13 @@ +
+ + + 44337: Dir listing crashes if no readme-file present (funkman) + + +
--------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org