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

[horwat]

horwat      01/03/15 14:42:15

  Modified:    jasper/src/share/org/apache/jasper/compiler
                        ParserController.java
  Log:
  On a windows system need to convert filepath to match file separator.
  
  Revision  Changes    Path
  1.11      +3 -2      
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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ParserController.java     2001/03/15 00:31:41     1.10
  +++ ParserController.java     2001/03/15 22:42:12     1.11
  @@ -417,12 +417,13 @@
        * baseDirStack.
        */
       private String resolveFileName(String inFileName) {
  -        boolean isAbsolute = inFileName.startsWith(File.separator);
  +     File file = new File(inFileName);
  +        boolean isAbsolute = file.getPath().startsWith(File.separator);
        String fileName = 
            isAbsolute ?
            inFileName : (String)baseDirStack.peek() + inFileName;
        String baseDir = 
  -         inFileName.substring(0, inFileName.lastIndexOf(File.separator) + 1);
  +         inFileName.substring(0, file.getPath().lastIndexOf(File.separator) + 1);
        baseDirStack.push(baseDir);
        return fileName;
       }