markt       2005/06/27 14:54:55

  Modified:    catalina/src/share/org/apache/naming/resources
                        FileDirContext.java
  Log:
  DefaultServlet was showing symbolic links in directory listings with
   - no last modified date for files or dirs
   - no size for files
   - files were displayed as directories.
  
  Revision  Changes    Path
  1.18      +5 -1      
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java
  
  Index: FileDirContext.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- FileDirContext.java       4 Feb 2005 22:08:03 -0000       1.17
  +++ FileDirContext.java       27 Jun 2005 21:54:55 -0000      1.18
  @@ -212,6 +212,8 @@
           if (file.isDirectory()) {
               FileDirContext tempContext = new FileDirContext(env);
               tempContext.setDocBase(file.getPath());
  +            tempContext.setAllowLinking(getAllowLinking());
  +            tempContext.setCaseSensitive(isCaseSensitive());
               result = tempContext;
           } else {
               result = new FileResource(file);
  @@ -892,6 +894,8 @@
               if (currentFile.isDirectory()) {
                   FileDirContext tempContext = new FileDirContext(env);
                   tempContext.setDocBase(file.getPath());
  +                tempContext.setAllowLinking(getAllowLinking());
  +                tempContext.setCaseSensitive(isCaseSensitive());
                   object = tempContext;
               } else {
                   object = new FileResource(currentFile);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to