remm 02/01/04 15:14:53
Modified: catalina/src/share/org/apache/catalina/core Tag:
tomcat_40_branch StandardContextMapper.java
Log:
- Port patch.
- '/' is now handled as a special case, since otherwise it is exactly matched to
the default servlet, even if a '/*' mapping is defined.
Revision Changes Path
No revision
No revision
1.6.2.1 +6 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextMapper.java
Index: StandardContextMapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextMapper.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- StandardContextMapper.java 22 Jul 2001 20:25:08 -0000 1.6
+++ StandardContextMapper.java 4 Jan 2002 23:14:53 -0000 1.6.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextMapper.java,v
1.6 2001/07/22 20:25:08 pier Exp $
- * $Revision: 1.6 $
- * $Date: 2001/07/22 20:25:08 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextMapper.java,v
1.6.2.1 2002/01/04 23:14:53 remm Exp $
+ * $Revision: 1.6.2.1 $
+ * $Date: 2002/01/04 23:14:53 $
*
* ====================================================================
*
@@ -85,7 +85,7 @@
* <code>StandardContext</code>, because it relies on internal APIs.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2001/07/22 20:25:08 $
+ * @version $Revision: 1.6.2.1 $ $Date: 2002/01/04 23:14:53 $
*/
public final class StandardContextMapper
@@ -224,7 +224,8 @@
if (wrapper == null) {
if (debug >= 2)
context.log(" Trying exact match");
- name = context.findServletMapping(relativeURI);
+ if (!(relativeURI.equals("/")))
+ name = context.findServletMapping(relativeURI);
if (name != null)
wrapper = (Wrapper) context.findChild(name);
if (wrapper != null) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
