cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Parser.java

[kinman]

kinman      2005/03/09 11:13:20

  Modified:    jasper2/src/share/org/apache/jasper/compiler Parser.java
  Log:
  - Fix a bug: if \${} appears at the beginning of a page, the escape is not
    recognized.
  
  Revision  Changes    Path
  1.90      +5 -1      
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
  
  Index: Parser.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -u -r1.89 -r1.90
  --- Parser.java       17 Mar 2004 19:23:03 -0000      1.89
  +++ Parser.java       9 Mar 2005 19:13:20 -0000       1.90
  @@ -1381,7 +1381,11 @@
        CharArrayWriter ttext = new CharArrayWriter();
        // Output the first character
        int ch = reader.nextChar();
  -     ttext.write(ch);
  +        if (ch == '\\') {
  +            reader.pushChar();
  +        } else {
  +            ttext.write(ch);
  +        }
   
        while (reader.hasMoreInput()) {
            ch = reader.nextChar();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]