kinman 2004/03/30 11:18:43
Modified: jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
Log:
- Fix bugzilla 28058: JspRuntimeLibrary.getContextRelativePath() can throw
StringIndexOutOfBoundsException
Revision Changes Path
1.30 +4 -2
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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- JspRuntimeLibrary.java 17 Mar 2004 19:23:04 -0000 1.29
+++ JspRuntimeLibrary.java 30 Mar 2004 19:18:43 -0000 1.30
@@ -916,12 +916,14 @@
String pathInfo = (String)
request.getAttribute("javax.servlet.include.path_info");
if (pathInfo == null) {
- uri = uri.substring(0, uri.lastIndexOf('/'));
+ if (uri.lastIndexOf('/') >= 0)
+ uri = uri.substring(0, uri.lastIndexOf('/'));
}
}
else {
uri = hrequest.getServletPath();
- uri = uri.substring(0, uri.lastIndexOf('/'));
+ if (uri.lastIndexOf('/') >= 0)
+ uri = uri.substring(0, uri.lastIndexOf('/'));
}
return uri + '/' + relativePath;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
