Author: markt Date: Mon May 24 11:19:35 2010 New Revision: 947603 URL: http://svn.apache.org/viewvc?rev=947603&view=rev Log: Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48701 Take account of TagVariableInfo when implementing the rules of JSP.5.3
Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=947603&r1=947602&r2=947603&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Mon May 24 11:19:35 2010 @@ -65,12 +65,6 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko, markt -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701 - Tag account of TagVariableInfo when implementing the rules of JSP.5.3 - http://people.apache.org/~markt/patches/2010-03-09-bug48701.patch - +1: markt, kkolinko, rjung - -1: - * Configure Tomcat to use HttpOnly for session cookies by default http://people.apache.org/~kkolinko/patches/2010-04-21_tc55_context_httpOnly.patch +1: kkolinko Modified: tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java?rev=947603&r1=947602&r2=947603&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java (original) +++ tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java Mon May 24 11:19:35 2010 @@ -1713,6 +1713,21 @@ class Generator { pageInfo.getVarInfoNames().add(info.getVarName()); } } + TagVariableInfo[] tagInfos = n.getTagVariableInfos(); + if (tagInfos != null && tagInfos.length > 0) { + for (int i = 0; i < tagInfos.length; i++) { + TagVariableInfo tagInfo = tagInfos[i]; + if (tagInfo != null) { + String name = tagInfo.getNameGiven(); + if (name == null) { + String nameFromAttribute = + tagInfo.getNameFromAttribute(); + name = n.getAttributeValue(nameFromAttribute); + } + pageInfo.getVarInfoNames().add(name); + } + } + } if (n.implementsSimpleTag()) { generateCustomDoTag(n, handlerInfo, tagHandlerVar); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org