remm 2003/09/12 10:04:12
Modified: catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
- Remove overriding the mapped servlet path with the jsp-file. I cannot find
anything in the specification which says that it must be done, and it contradicts
all the other mapping rules. This code was introduced in Tomcat 4.0 b5 (yes,
I had to go back for a *while*).
- This fixes tester failures with the latest changes to JSP servlet.
Revision Changes Path
1.26 +4 -13
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
Index: ApplicationDispatcher.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ApplicationDispatcher.java 2 Sep 2003 21:22:04 -0000 1.25
+++ ApplicationDispatcher.java 12 Sep 2003 17:04:12 -0000 1.26
@@ -196,15 +196,6 @@
this.pathInfo + ", queryString=" + queryString +
", name=" + this.name);
- // If this is a wrapper for a JSP page (<jsp-file>), tweak
- // the request parameters appropriately
- String jspFile = wrapper.getJspFile();
- if (jspFile != null) {
- if ( log.isDebugEnabled() )
- log.debug("-->servletPath=" + jspFile);
- this.servletPath = jspFile;
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
