kinman 02/05/16 13:59:21
Modified: jasper2/src/share/org/apache/jasper/compiler
TagLibraryInfoImpl.java
jasper2/src/share/org/apache/jasper/resources
messages.properties
Log:
- Fixed 5793
Revision Changes Path
1.2 +13 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TagLibraryInfoImpl.java 28 Mar 2002 18:46:17 -0000 1.1
+++ TagLibraryInfoImpl.java 16 May 2002 20:59:21 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.1 2002/03/28 18:46:17 kinman Exp $
- * $Revision: 1.1 $
- * $Date: 2002/03/28 18:46:17 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.2 2002/05/16 20:59:21 kinman Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/05/16 20:59:21 $
*
* The Apache Software License, Version 1.1
*
@@ -86,6 +86,7 @@
Hashtable jarEntries;
JspCompilationContext ctxt;
+ ErrorDispatcher err;
private final void print(String name, String value, PrintWriter w) {
if (value != null) {
@@ -144,6 +145,7 @@
super(prefix, uriIn);
this.ctxt = ctxt;
+ this.err = err;
ZipInputStream zin;
InputStream in = null;
URL url = null;
@@ -375,6 +377,14 @@
Logger.WARNING
);
}
+
+ // 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) {
+ err.jspError("jsp.warning.teiclass.is.nonnull", teiclass);
+ }
TagInfo taginfo = new TagInfo(name, tagclass, bodycontent,
info, this,
1.6 +2 -1
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- messages.properties 6 May 2002 04:35:24 -0000 1.5
+++ messages.properties 16 May 2002 20:59:21 -0000 1.6
@@ -1,4 +1,4 @@
-# $Id: messages.properties,v 1.5 2002/05/06 04:35:24 glenn Exp $
+# $Id: messages.properties,v 1.6 2002/05/16 20:59:21 kinman Exp $
#
# Default localized string information
# Localized this the Default Locale as is en_US
@@ -127,6 +127,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.warning.teiclass.is.nonnull=variable susbelement defined in tld when
TagExtraInfo class {0} is non-null
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:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
