cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core ApplicationContext.java

[remm]

remm        02/04/26 14:18:18

  Modified:    catalina/src/share/org/apache/catalina/core
                        ApplicationContext.java
  Log:
  - Partially revert the patch for 6662, as the new test was not correct
    in some cases (Watchdog caught it).
  
  Revision  Changes    Path
  1.37      +7 -5      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
  
  Index: ApplicationContext.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- ApplicationContext.java   24 Apr 2002 08:39:53 -0000      1.36
  +++ ApplicationContext.java   26 Apr 2002 21:18:18 -0000      1.37
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
 1.36 2002/04/24 08:39:53 remm Exp $
  - * $Revision: 1.36 $
  - * $Date: 2002/04/24 08:39:53 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
 1.37 2002/04/26 21:18:18 remm Exp $
  + * $Revision: 1.37 $
  + * $Date: 2002/04/26 21:18:18 $
    *
    * ====================================================================
    *
  @@ -114,7 +114,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.36 $ $Date: 2002/04/24 08:39:53 $
  + * @version $Revision: 1.37 $ $Date: 2002/04/26 21:18:18 $
    */
   
   public class ApplicationContext
  @@ -422,7 +422,9 @@
   
           // Return the current context if requested
           String contextPath = context.getPath();
  -        if ((contextPath.length() > 0) && (uri.equals(contextPath))) {
  +        if (!contextPath.endsWith("/"))
  +            contextPath = contextPath + "/";
  +        if ((contextPath.length() > 0) && (uri.startsWith(contextPath))) {
               return (this);
           }
   
  
  
  

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