jfarcand 2002/12/17 11:21:07
Modified: jasper2/src/share/org/apache/jasper/servlet JspServlet.java
Log:
Remove the first condition since it is not required. The getPathInfo() returns
always null except when the <jsp-property-file> element is used and the <servlet-name>
is not defined in the web.xml. I'm not happy with the solution but I don't think we
need to change the url-mapping algorithm (StandardCpntextMapper) to include this
corner case.
Revision Changes Path
1.16 +4 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServlet.java
Index: JspServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServlet.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JspServlet.java 13 Dec 2002 21:38:06 -0000 1.15
+++ JspServlet.java 17 Dec 2002 19:21:07 -0000 1.16
@@ -217,7 +217,7 @@
// jsp is not defined with <servlet-name>, the url
// as to be passed as it is to the JSP container (since Catalina
// doesn't know anything about the requested JSP
- if(request.getServletPath().indexOf(".") == -1 &&
request.getPathInfo() != null){
+ if(request.getPathInfo() != null){
jspUri = request.getServletPath() + request.getPathInfo();
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
