kinman 2004/03/04 16:44:03 Modified: jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java Log: - When a.jsp jsp:includes b.jsp that jsp:includes c.jsp, the context relative path for c.jsp is computed incorrectly. Revision Changes Path 1.27 +7 -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.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- JspRuntimeLibrary.java 5 Feb 2004 22:16:47 -0000 1.26 +++ JspRuntimeLibrary.java 5 Mar 2004 00:44:03 -0000 1.27 @@ -958,10 +958,11 @@ HttpServletRequest hrequest = (HttpServletRequest) request; String uri = (String) request.getAttribute("javax.servlet.include.servlet_path"); - if (uri == null) - uri = hrequest.getServletPath(); + if (uri != null) { + return uri + '/' + relativePath; + } + uri = hrequest.getServletPath(); return (uri.substring(0, uri.lastIndexOf('/')) + '/' + relativePath); - }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]