You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by bi...@apache.org on 2002/01/22 05:18:39 UTC

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

billbarker    02/01/21 20:18:38

  Modified:    src/share/org/apache/jasper/compiler JspReader.java
  Log:
  Handle extra "---" in JSP comments.
  
  Fix for bug 5191.
  
  Submitted by: Drew Sudell asudell@acm.org
  
  Revision  Changes    Path
  1.25      +4 -1      jakarta-tomcat/src/share/org/apache/jasper/compiler/JspReader.java
  
  Index: JspReader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspReader.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- JspReader.java	18 Sep 2001 23:24:46 -0000	1.24
  +++ JspReader.java	22 Jan 2002 04:18:38 -0000	1.25
  @@ -436,8 +436,11 @@
   	    
   	    if ( ch == limit.charAt(0) ) {
   		for (int i = 1 ; i < limlen ; i++) {
  -		    if (Character.toLowerCase((char) nextChar()) != limit.charAt(i))
  +		    if (Character.toLowerCase((char) nextChar()) != limit.charAt(i)){
  +			reset(ret);
  +			advance(1);
   			continue skip;
  +		    }
   		}
   		return ret;
   	    }
  
  
  

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