remm 2002/07/24 02:08:36
Modified: jasper2/src/share/org/apache/jasper Tag: tomcat_4_branch
JspCompilationContext.java
Log:
- Canonicalize result of getResource and getResourceAsStream.
- Fixes 10629.
- Patch submitted by Andrew Conrad <andrewconrad at msn.com>
Revision Changes Path
No revision
No revision
1.6.2.3 +5 -5
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java
Index: JspCompilationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- JspCompilationContext.java 18 Jul 2002 20:48:19 -0000 1.6.2.2
+++ JspCompilationContext.java 24 Jul 2002 09:08:36 -0000 1.6.2.3
@@ -227,12 +227,12 @@
* as an InputStream.
*/
public java.io.InputStream getResourceAsStream(String res) {
- return context.getResourceAsStream(res);
+ return context.getResourceAsStream(canonicalURI(res));
}
public URL getResource(String res) throws MalformedURLException {
- return context.getResource(res);
+ return context.getResource(canonicalURI(res));
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
