kinman 2004/03/04 18:02:46
Modified: jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
Log:
- The last patch is not quite right: it only works if the path info is non-null.
Revision Changes Path
1.28 +13 -6
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- JspRuntimeLibrary.java 5 Mar 2004 00:44:03 -0000 1.27
+++ JspRuntimeLibrary.java 5 Mar 2004 02:02:46 -0000 1.28
@@ -959,10 +959,17 @@
String uri = (String)
request.getAttribute("javax.servlet.include.servlet_path");
if (uri != null) {
- return uri + '/' + relativePath;
+ String pathInfo = (String)
+ request.getAttribute("javax.servlet.include.path_info");
+ if (pathInfo == null) {
+ uri = uri.substring(0, uri.lastIndexOf('/'));
+ }
}
- uri = hrequest.getServletPath();
- return (uri.substring(0, uri.lastIndexOf('/')) + '/' + relativePath);
+ else {
+ uri = hrequest.getServletPath();
+ uri = uri.substring(0, uri.lastIndexOf('/'));
+ }
+ return uri + '/' + relativePath;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
