You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ki...@apache.org on 2002/08/29 01:50:10 UTC

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

kinman      2002/08/28 16:50:10

  Modified:    jasper2/src/share/org/apache/jasper/compiler JspReader.java
  Log:
  - Fixed 12128: <%-- ---%> is a valid comment
  
  Revision  Changes    Path
  1.9       +4 -1      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspReader.java
  
  Index: JspReader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspReader.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JspReader.java	24 Aug 2002 21:42:34 -0000	1.8
  +++ JspReader.java	28 Aug 2002 23:50:10 -0000	1.9
  @@ -417,11 +417,14 @@
           for (ret = mark(), ch = nextChar() ; ch != -1 ;
                    ret = mark(), ch = nextChar()) {
               if (ch == limit.charAt(0)) {
  +                Mark restart = mark();
                   for (int i = 1 ; i < limlen ; i++) {
                       if (peekChar() == limit.charAt(i))
                           nextChar();
  -                    else
  +                    else {
  +                        reset(restart);
                           continue skip;
  +                    }
                   }
                   return ret;
               }
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>