tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kin...@apache.org
Subject cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Parser.java
Date Fri, 30 May 2003 20:16:20 GMT
kinman      2003/05/30 13:16:19

  Modified:    jasper2/src/share/org/apache/jasper/compiler Parser.java
  Log:
  - In a template text, the char after '$' are not handled correctly.
  
  Revision  Changes    Path
  1.75      +6 -4      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.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- Parser.java	21 May 2003 18:09:33 -0000	1.74
  +++ Parser.java	30 May 2003 20:16:19 -0000	1.75
  @@ -1432,6 +1432,8 @@
   		    break;
   		}
   		ttext.write('$');
  +		reader.pushChar();
  +		continue;
   	    }
   	    else if (ch == '\\') {
   		if (!reader.hasMoreInput()) {
  @@ -1501,7 +1503,7 @@
                       ch = reader.nextChar();
                       if (ch != '{') {
                           ttext.write('$');
  -                        ttext.write(ch);
  +                        reader.pushChar();
                           continue;
                       }
                       // Create a template text node
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message