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

[horwat]

horwat      01/03/14 16:31:41

  Modified:    jasper/src/share/org/apache/jasper/compiler
                        ParserController.java
  Log:
  Bug Fix: jspc didn't work well under windows since file separator assumed to be "/" 
in ParserController.resolveFileName
  
  Bugzilla: #821 & #487
  
  Revision  Changes    Path
  1.10      +2 -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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ParserController.java     2000/12/22 18:37:39     1.9
  +++ ParserController.java     2001/03/15 00:31:41     1.10
  @@ -417,12 +417,12 @@
        * baseDirStack.
        */
       private String resolveFileName(String inFileName) {
  -        boolean isAbsolute = inFileName.startsWith("/");
  +        boolean isAbsolute = inFileName.startsWith(File.separator);
        String fileName = 
            isAbsolute ?
            inFileName : (String)baseDirStack.peek() + inFileName;
        String baseDir = 
  -         inFileName.substring(0, inFileName.lastIndexOf("/") + 1);
  +         inFileName.substring(0, inFileName.lastIndexOf(File.separator) + 1);
        baseDirStack.push(baseDir);
        return fileName;
       }