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 PageInfo.java Parser.java Validator.java
Date Wed, 04 Sep 2002 22:54:54 GMT
kinman      2002/09/04 15:54:54

  Modified:    jasper2/src/share/org/apache/jasper/compiler PageInfo.java
                        Parser.java Validator.java
  Log:
  - Fixed 12107: Null content type when a tag file is used.
  
  Revision  Changes    Path
  1.11      +3 -12     jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java
  
  Index: PageInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- PageInfo.java	28 Aug 2002 23:00:19 -0000	1.10
  +++ PageInfo.java	4 Sep 2002 22:54:54 -0000	1.11
  @@ -92,7 +92,6 @@
       private boolean scriptless = false;
       private boolean scriptingEnabled = true;
       private boolean elEnabled = true;
  -    private boolean tagFile = false;
       private boolean isXml = false;
       private boolean isXmlSpecified = false;	// true is there is a is-xml
   						// element in jsp-config
  @@ -249,14 +248,6 @@
   
       public boolean isELEnabled() {
   	return elEnabled;
  -    }
  -
  -    public void setTagFile(boolean s) {
  -	tagFile = s;
  -    }
  -
  -    public boolean isTagFile() {
  -	return tagFile;
       }
   
       public boolean isXml() {
  
  
  
  1.29      +3 -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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- Parser.java	4 Sep 2002 17:59:11 -0000	1.28
  +++ Parser.java	4 Sep 2002 22:54:54 -0000	1.29
  @@ -119,7 +119,6 @@
   	this.currentFile = reader.mark().getFile();
           this.scriptlessCount = 0;
   	this.isTagFile = isTagFile;
  -	pc.getCompiler().getPageInfo().setTagFile(isTagFile);
           start = reader.mark();
       }
   
  
  
  
  1.34      +4 -4      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java
  
  Index: Validator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- Validator.java	3 Sep 2002 22:26:23 -0000	1.33
  +++ Validator.java	4 Sep 2002 22:54:54 -0000	1.34
  @@ -1080,7 +1080,7 @@
   	// http://jcp.org/aboutJava/communityprocess/maintenance/jsr053/errata_1_2_a_20020321.html
   	PageInfo pageInfo = compiler.getPageInfo();
   	String contentType = pageInfo.getContentType();
  -	if (!pageInfo.isTagFile() && 
  +	if (!compiler.getCompilationContext().isTagFile() && 
   		(contentType == null || contentType.indexOf("charset=") < 0)) {
   	    boolean isXml = page.getRoot().isXmlSyntax();
   	    String defaultType;
  
  
  

--
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