cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper Mapper.java

[remm]

remm        2003/03/02 08:16:47

  Modified:    util/java/org/apache/tomcat/util/http/mapper Mapper.java
  Log:
  - Properly restore path after failing to map welcome files.
  
  Revision  Changes    Path
  1.7       +7 -2      
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java
  
  Index: Mapper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Mapper.java       17 Feb 2003 16:31:44 -0000      1.6
  +++ Mapper.java       2 Mar 2003 16:16:47 -0000       1.7
  @@ -525,7 +525,7 @@
                       } catch(NamingException nex) {
                           // Swallow not found, since this is normal
                       }
  -                    if(file != null && !(file instanceof DirContext) ) {
  +                    if (file != null && !(file instanceof DirContext) ) {
                           if(logger.isTraceEnabled())
                               logger.trace("Found welcome-file: " + path);
                           internalMapExtensionWrapper(extensionWrappers,
  @@ -538,7 +538,12 @@
                                   (path.getBuffer(), path.getStart(), 
path.getLength());
                           }
                       }
  -                }       
  +                }
  +                if (mappingData.wrapper == null) {
  +                    // Restore the path if no welcome files was found
  +                    path.setOffset(pathOffset);
  +                    path.setEnd(pathEnd);
  +                }
               }
           }
   
  
  
  

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