Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 23643 invoked from network); 1 Apr 2004 20:09:31 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 1 Apr 2004 20:09:31 -0000 Received: (qmail 63997 invoked by uid 500); 1 Apr 2004 20:09:12 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 63950 invoked by uid 500); 1 Apr 2004 20:09:12 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 63936 invoked by uid 500); 1 Apr 2004 20:09:12 -0000 Received: (qmail 63933 invoked from network); 1 Apr 2004 20:09:12 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 1 Apr 2004 20:09:12 -0000 Received: (qmail 23567 invoked by uid 1787); 1 Apr 2004 20:09:21 -0000 Date: 1 Apr 2004 20:09:21 -0000 Message-ID: <20040401200921.23566.qmail@minotaur.apache.org> From: markt@apache.org To: jakarta-tomcat-catalina-cvs@apache.org Subject: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationContext.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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