kinman 2002/09/27 17:46:28
Modified: jasper2/src/share/org/apache/jasper/compiler Parser.java
Log:
- Fix 13058: Dynamic attributes specified in <jsp:attribute> body do not
take RT expressions.
Revision Changes Path
1.32 +8 -5
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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Parser.java 12 Sep 2002 21:57:00 -0000 1.31
+++ Parser.java 28 Sep 2002 00:46:28 -0000 1.32
@@ -1715,8 +1715,8 @@
private String getAttributeBodyType(Node n, String name) {
if (n instanceof Node.CustomTag) {
- TagAttributeInfo[] tldAttrs =
- ((Node.CustomTag)n).getTagInfo().getAttributes();
+ TagInfo tagInfo = ((Node.CustomTag)n).getTagInfo();
+ TagAttributeInfo[] tldAttrs = tagInfo.getAttributes();
for (int i=0; i<tldAttrs.length; i++) {
if (name.equals(tldAttrs[i].getName())) {
if (tldAttrs[i].isFragment()) {
@@ -1726,6 +1726,9 @@
return TagInfo.BODY_CONTENT_JSP;
}
}
+ }
+ if (tagInfo.hasDynamicAttributes()) {
+ return TagInfo.BODY_CONTENT_JSP;
}
} else if (n instanceof Node.IncludeAction) {
if ("page".equals(name)) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
