kinman 2003/12/05 10:33:19
Modified: jasper2/src/share/org/apache/jasper/compiler
TagFileProcessor.java
Log:
- For tag files, don't issue error for multiple definition when both are for
dynamic-attributes.
Revision Changes Path
1.54 +3 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java
Index: TagFileProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- TagFileProcessor.java 4 Dec 2003 19:37:58 -0000 1.53
+++ TagFileProcessor.java 5 Dec 2003 18:33:19 -0000 1.54
@@ -401,7 +401,7 @@
HashMap table = (type == VAR_NAME_FROM)? nameFromTable: nameTable;
NameEntry nameEntry = (NameEntry) table.get(name);
if (nameEntry != null) {
- if (type != TAG_DYNAMIC) {
+ if (type != TAG_DYNAMIC || nameEntry.getType() != TAG_DYNAMIC) {
int line = nameEntry.getNode().getStart().getLineNumber();
err.jspError(n, "jsp.error.tagfile.nameNotUnique",
type, nameEntry.getType(), Integer.toString(line));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
