You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by la...@apache.org on 2001/03/21 04:05:27 UTC

cvs commit: jakarta-tomcat/src/share/org/apache/jasper JasperEngineContext.java

larryi      01/03/20 19:05:26

  Modified:    src/share/org/apache/jasper JasperEngineContext.java
  Log:
  Implement resolveRelativeUri() method.
  
  Fix for Bugzilla Bug 1045.
  
  Revision  Changes    Path
  1.2       +6 -1      jakarta-tomcat/src/share/org/apache/jasper/JasperEngineContext.java
  
  Index: JasperEngineContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JasperEngineContext.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JasperEngineContext.java	2001/01/28 05:54:34	1.1
  +++ JasperEngineContext.java	2001/03/21 03:05:25	1.2
  @@ -286,7 +286,12 @@
       public String resolveRelativeUri(String uri)
       {
   	if( debug>0 ) log("resolveRelativeUri " + uri);
  -	return null;
  +	if (uri.charAt(0) == '/') {
  +	    return uri;
  +        } else {
  +            String baseURI = jspFile.substring(0, jspFile.lastIndexOf('/'));
  +            return baseURI + '/' + uri;
  +        }
       }
   
       public java.io.InputStream getResourceAsStream(String res)