cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler ParserController.java

[remm]

remm        01/03/20 16:27:03

  Modified:    jasper/src/share/org/apache/jasper/compiler
                        ParserController.java
  Log:
  - The fix in that source file wasn't the same as in JspReader (and the fix in
    JspReader appears to be a bit better).
  
  Revision  Changes    Path
  1.13      +4 -1      
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserController.java
  
  Index: ParserController.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserController.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ParserController.java     2001/03/21 00:08:51     1.12
  +++ ParserController.java     2001/03/21 00:27:01     1.13
  @@ -187,7 +187,10 @@
           File file = new File(absFileName);
        String filePath = (ctxt == null) 
            ? file.getAbsolutePath()
  -         : file.toString();//ctxt.getRealPath(file.toString());
  +         : ctxt.getRealPath(file.toString());
  +        if (filePath == null) {
  +            filePath = file.toString();
  +        }
        //p("filePath: " + filePath);
   
        String encoding = topFileEncoding;