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/servlet JspServletWrapper.java
Date Thu, 29 Aug 2002 18:31:20 GMT
kinman      2002/08/29 11:31:20

  Modified:    jasper2/src/share/org/apache/jasper/compiler
                        ParserController.java
               jasper2/src/share/org/apache/jasper/servlet
                        JspServletWrapper.java
  Log:
  - Fix the regression that isTagFile not passed correct when compiling tag files.
  
  Revision  Changes    Path
  1.17      +4 -3      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ParserController.java
  
  Index: ParserController.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ParserController.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ParserController.java	28 Aug 2002 23:00:19 -0000	1.16
  +++ ParserController.java	29 Aug 2002 18:31:20 -0000	1.17
  @@ -112,7 +112,9 @@
       private boolean isTopFile = true;
   
       /*
  -     * Tells if this is a regular jsp page or tag file.
  +     * Tells if the file to be parsed is a regular jsp page or tag file.
  +     * Usually we get the info from the compilation context, but it can
  +     * be temporarily overrideen with a parameter to the parse method
        */
       private boolean isTagFile = false;
   
  @@ -136,7 +138,6 @@
           this.ctxt = ctxt; // @@@ can we assert that ctxt is not null?
   	this.compiler = compiler;
       }
  -   
   
       public JspCompilationContext getJspCompilationContext () {
   	return ctxt;
  @@ -157,7 +158,7 @@
        */
       public Node.Nodes parse(String inFileName)
   	        throws FileNotFoundException, JasperException, IOException {
  -	return parse(inFileName, null, false);
  +	return parse(inFileName, null, ctxt.isTagFile());
       }
   
       /**
  
  
  
  1.16      +7 -3      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java
  
  Index: JspServletWrapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- JspServletWrapper.java	28 Aug 2002 23:00:19 -0000	1.15
  +++ JspServletWrapper.java	29 Aug 2002 18:31:20 -0000	1.16
  @@ -244,6 +244,10 @@
   	return null;
       }
   
  +    public boolean isTagFile() {
  +	return this.isTagFile;
  +    }
  +
       public void service(HttpServletRequest request, 
                           HttpServletResponse response,
                           boolean precompile)
  
  
  

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


Mime
View raw message