You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@apache.org on 2001/07/20 02:32:36 UTC

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

craigmcc    01/07/19 17:32:36

  Modified:    jasper/src/share/org/apache/jasper/compiler Compiler.java
  Log:
  Don't get confused by the ":" character that javac includes in the pathname on
  error messages (at least on Win2K and XP).
  
  PR: Bugzilla #2693
  Submitted by: James Turner <tu...@blackbear.com>
  
  Revision  Changes    Path
  1.11      +4 -4      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java
  
  Index: Compiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Compiler.java	2001/07/12 21:40:56	1.10
  +++ Compiler.java	2001/07/20 00:32:36	1.11
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v 1.10 2001/07/12 21:40:56 horwat Exp $
  - * $Revision: 1.10 $
  - * $Date: 2001/07/12 21:40:56 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v 1.11 2001/07/20 00:32:36 craigmcc Exp $
  + * $Revision: 1.11 $
  + * $Date: 2001/07/20 00:32:36 $
    *
    * ====================================================================
    * 
  @@ -308,7 +308,7 @@
               if (line==null) break;
   
               // line number is between a set of colons
  -            int beginColon=line.indexOf(':');
  +            int beginColon=line.indexOf(':', 2); // Drive letter on Windows !!
               int endColon=line.indexOf(':', beginColon+1);
   
               if (beginColon<0 || endColon<0) {