From b56be9209f26b9d66c4ac77254d635c4ea99e77a Mon Sep 17 00:00:00 2001 From: funkman Date: Mon, 4 Feb 2008 02:10:39 +0000 Subject: [PATCH] http://issues.apache.org/bugzilla/show_bug.cgi?id=44337 Dir listing crashes if no readme-file present Catch NamingException on resource not found instead of checking for null git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@618150 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/servlets/DefaultServlet.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java index 9f3f7c1d2..57631f2d1 100644 --- a/java/org/apache/catalina/servlets/DefaultServlet.java +++ b/java/org/apache/catalina/servlets/DefaultServlet.java @@ -1415,7 +1415,10 @@ public class DefaultServlet 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 @@ public class DefaultServlet return is; } } catch (NamingException e) { - throw new ServletException("Error opening XSLT resource", e); + if (debug > 10) + log("localXsltFile '" + localXsltFile + "' not found", e); + + return null; } } -- 2.11.0