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

[remm]

remm        2003/03/06 09:11:43

  Modified:    util/java/org/apache/tomcat/util/http/mapper Mapper.java
  Log:
  - Add a check for a null context.
  - Fix the code reinitializing the path when a welcome file wasn't found
    (it was resetting to the URI root).
  
  Revision  Changes    Path
  1.8       +2 -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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Mapper.java       2 Mar 2003 16:16:47 -0000       1.7
  +++ Mapper.java       6 Mar 2003 17:11:42 -0000       1.8
  @@ -433,7 +433,7 @@
           }
   
           // Wrapper mapping
  -        if (mappingData.wrapper == null) {
  +        if ((context != null) && (mappingData.wrapper == null)) {
               internalMapWrapper(context, uri, mappingData);
           }
   
  @@ -541,7 +541,7 @@
                   }
                   if (mappingData.wrapper == null) {
                       // Restore the path if no welcome files was found
  -                    path.setOffset(pathOffset);
  +                    path.setOffset(servletPath);
                       path.setEnd(pathEnd);
                   }
               }
  
  
  

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