tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationContext.java
Date Thu, 01 Apr 2004 20:09:21 GMT
markt       2004/04/01 12:09:21

  Modified:    catalina/src/share/org/apache/catalina/core
                        ApplicationContext.java
  Log:
  - Fix getContext("/") so current context is returned if called whilst in the root context
  - Port from TC5
  
  Revision  Changes    Path
  1.25      +4 -4      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
  
  Index: ApplicationContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- ApplicationContext.java	5 Mar 2004 23:52:55 -0000	1.24
  +++ ApplicationContext.java	1 Apr 2004 20:09:21 -0000	1.25
  @@ -213,9 +213,9 @@
           String contextPath = context.getPath();
           if (!contextPath.endsWith("/"))
               contextPath = contextPath + "/";
  -        if ((contextPath.length() > 1) && 
  -            ((uri.equals(context.getPath())) 
  -             || (uri.startsWith(contextPath)))) {
  +
  +        if (((contextPath.length() > 1) && (uri.startsWith(contextPath))) ||
  +            ((contextPath.equals("/")) && (uri.equals("/")))) {
               return (this);
           }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message