You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@locus.apache.org on 2000/05/03 02:09:59 UTC

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

mandar      00/05/02 17:09:59

  Modified:    src/share/org/apache/jasper/compiler Mark.java
  Log:
  Jsp Reader was pushing wrong fileName on the stack.
  
  Revision  Changes    Path
  1.4       +4 -4      jakarta-tomcat/src/share/org/apache/jasper/compiler/Mark.java
  
  Index: Mark.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Mark.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Mark.java	2000/04/24 22:53:12	1.3
  +++ Mark.java	2000/05/03 00:09:59	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Mark.java,v 1.3 2000/04/24 22:53:12 mandar Exp $
  - * $Revision: 1.3 $
  - * $Date: 2000/04/24 22:53:12 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Mark.java,v 1.4 2000/05/03 00:09:59 mandar Exp $
  + * $Revision: 1.4 $
  + * $Date: 2000/05/03 00:09:59 $
    *
    * ====================================================================
    * 
  @@ -161,7 +161,7 @@
       {
   
   	// store current state in stack
  -	includeStack.push(new IncludeState(cursor, line, col, fileid, name, baseDir, 
  +	includeStack.push(new IncludeState(cursor, line, col, fileid, fileName, baseDir, 
   					   encoding, stream) );
   
   	// set new variables