tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu...@apache.org
Subject cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties
Date Thu, 17 Oct 2002 22:56:02 GMT
luehe       2002/10/17 15:56:02

  Modified:    jasper2/src/share/org/apache/jasper/compiler Validator.java
               jasper2/src/share/org/apache/jasper/resources
                        messages.properties
  Log:
  Check array returned by TagExtraInfo.getVariableInfo() for non-emptiness instead of just
null
  
  Revision  Changes    Path
  1.45      +6 -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.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- Validator.java	17 Oct 2002 21:38:56 -0000	1.44
  +++ Validator.java	17 Oct 2002 22:56:02 -0000	1.45
  @@ -796,7 +796,9 @@
   	    // has one or more variable subelements to have a TagExtraInfo
   	    // class that returns a non-null object.
   	    TagExtraInfo tei = tagInfo.getTagExtraInfo();
  -	    if (tei != null && tei.getVariableInfo(tagData) != null
  +	    if (tei != null
  +		    && tei.getVariableInfo(tagData) != null
  +		    && tei.getVariableInfo(tagData).length > 0
   		    && tagInfo.getTagVariableInfos() != null
   		    && tagInfo.getTagVariableInfos().length > 0) {
   		err.jspError("jsp.error.non_null_tei_and_var_subelems",
  
  
  
  1.47      +2 -2      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties
  
  Index: messages.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- messages.properties	12 Oct 2002 18:55:30 -0000	1.46
  +++ messages.properties	17 Oct 2002 22:56:02 -0000	1.47
  @@ -132,7 +132,7 @@
   jsp.warning.unknown.element.in.attribute=Warning: Unknown element {0} in attribute
   jsp.error.more.than.one.taglib=More than one taglib in the TLD: {0}
   jsp.warning.teiclass.is.null=Could not load TagExtraInfo class {0}: {1}
  -jsp.error.non_null_tei_and_var_subelems=Tag {0} has one or more variable subelements and
a TagExtraInfo class that returns a non-null object
  +jsp.error.non_null_tei_and_var_subelems=Tag {0} has one or more variable subelements and
a TagExtraInfo class that returns one or more VariableInfo
   jsp.error.parse.error.in.TLD=Parse Error in the tag library descriptor: {0}
   jsp.error.unable.to.open.TLD=Unable to open the tag library descriptor: {0}
   jsp.buffer.size.zero=Buffer size <= 0
  
  
  

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