tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From funk...@apache.org
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 GMT
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 @@
   </properties>
 
 <body>
+<section name="Tomcat 6.0.17 (remm)">
+  <subsection name="Catalina">
+    <changelog>
+        <bug>44337</bug>:   Dir listing crashes if no readme-file present (funkman)
+    </changelog>
+  </subsection>
+</section>
 <section name="Tomcat 6.0.16 (remm)">
   <subsection name="General">
     <changelog>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message