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-4.0/jasper/src/share/org/apache/jasper/compiler TagLibraryInfoImpl.java
Date Thu, 16 May 2002 19:25:55 GMT
kinman      02/05/16 12:25:55

  Modified:    jasper/src/share/org/apache/jasper/compiler
                        TagLibraryInfoImpl.java
  Log:
  - Fixed 5793: Jasper should issue error when the variable element is defined
    in the tld, AND a TEI class is also provided.
  
  Revision  Changes    Path
  1.26      +14 -3     jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
  
  Index: TagLibraryInfoImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- TagLibraryInfoImpl.java	12 Dec 2001 18:43:16 -0000	1.25
  +++ TagLibraryInfoImpl.java	16 May 2002 19:25:55 -0000	1.26
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.25 2001/12/12 18:43:16 kinman Exp $
  - * $Revision: 1.25 $
  - * $Date: 2001/12/12 18:43:16 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.26 2002/05/16 19:25:55 kinman Exp $
  + * $Revision: 1.26 $
  + * $Date: 2002/05/16 19:25:55 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -415,6 +415,17 @@
                                     );
               }
   
  +        // JSP.C1: It is a (translation time) error for an action that
  +	// has one or more variable subelements to have a TagExtraInfo
  +	// class that returns a non-null object.
  +
  +	if (tei != null && variableVector.size() != 0) {
  +	    throw new JasperException(
  +                          Constants.getString(
  +                              "jsp.warning.teiclass.is.nonnull",
  +                              new Object[] {teiclass}));
  +        }
  +	
           TagInfo taginfo = new TagInfo(name, tagclass, bodycontent,
                                         info, this, 
                                         tei,
  
  
  

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