You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/08/18 20:24:44 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/resources DirectoryBean.java
craigmcc 00/08/18 11:24:43
Modified: catalina/src/share/org/apache/catalina/resources
DirectoryBean.java
Log:
Bring forward a cosmetic fix to the directory listing output.
Submitted by: Remy Maucherat
Revision Changes Path
1.2 +7 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/resources/DirectoryBean.java
Index: DirectoryBean.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/resources/DirectoryBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DirectoryBean.java 2000/08/11 22:45:57 1.1
+++ DirectoryBean.java 2000/08/18 18:24:40 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/resources/DirectoryBean.java,v 1.1 2000/08/11 22:45:57 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/11 22:45:57 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/resources/DirectoryBean.java,v 1.2 2000/08/18 18:24:40 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/08/18 18:24:40 $
*
* ====================================================================
*
@@ -91,7 +91,7 @@
* manner. No internal synchronization is performed.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2000/08/11 22:45:57 $
+ * @version $Revision: 1.2 $ $Date: 2000/08/18 18:24:40 $
*/
public final class DirectoryBean extends ResourceBean {
@@ -229,7 +229,9 @@
public InputStream render(String contextPath) {
// Number of characters to trim from the beginnings of filenames
- int trim = name.length() + 1;
+ int trim = name.length();
+ if (!name.endsWith("/"))
+ trim += 1;
if (name.equals("/"))
trim = 1;