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

[remm]

remm        01/09/24 17:50:51

  Modified:    jasper/src/share/org/apache/jasper/compiler Tag:
                        tomcat_40_branch Compiler.java
  Log:
  - Fixes #3617.  Patch supplied by [EMAIL PROTECTED]
    (Martijn Koster).
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.12.2.1  +9 -7      
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.12
  retrieving revision 1.12.2.1
  diff -u -r1.12 -r1.12.2.1
  --- Compiler.java     2001/09/15 23:47:17     1.12
  +++ Compiler.java     2001/09/25 00:50:51     1.12.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v
 1.12 2001/09/15 23:47:17 craigmcc Exp $
  - * $Revision: 1.12 $
  - * $Date: 2001/09/15 23:47:17 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v
 1.12.2.1 2001/09/25 00:50:51 remm Exp $
  + * $Revision: 1.12.2.1 $
  + * $Date: 2001/09/25 00:50:51 $
    *
    * ====================================================================
    * 
  @@ -324,11 +324,13 @@
   
               // Now do the mapping
               String mapping = findMapping(map, lineNr);
  -            if (mapping != null) {
  -                errorMsg.append(findMapping(map, lineNr));
  -                errorMsg.append(line);
  +            if (mapping == null)
                   errorMsg.append('\n');
  -            }
  +            else
  +                errorMsg.append(mapping);
  +            errorMsg.append(line);
  +            errorMsg.append('\n');
  +
           }
           br.close();
           map.clear();