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

[remm]

remm        01/09/02 20:34:08

  Modified:    jasper/src/share/org/apache/jasper/compiler
                        ParserController.java
  Log:
  - Fix (again) bug 821.
  
  Revision  Changes    Path
  1.17      +4 -4      
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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ParserController.java     2001/07/10 20:12:07     1.16
  +++ ParserController.java     2001/09/03 03:34:08     1.17
  @@ -413,10 +413,10 @@
        * baseDirStack.
        */
       private String resolveFileName(String inFileName) {
  -        boolean isAbsolute = inFileName.startsWith("/");
  -     String fileName = 
  -         isAbsolute ?
  -         inFileName : (String) baseDirStack.peek() + inFileName;
  +        String fileName = inFileName.replace('\\', '/');
  +        boolean isAbsolute = fileName.startsWith("/");
  +     fileName = isAbsolute ? fileName 
  +            : (String) baseDirStack.peek() + fileName;
        String baseDir = 
            fileName.substring(0, fileName.lastIndexOf("/") + 1);
        baseDirStack.push(baseDir);