tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r947612 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/Generator.java
Date Mon, 24 May 2010 11:52:00 GMT
Author: markt
Date: Mon May 24 11:52:00 2010
New Revision: 947612

URL: http://svn.apache.org/viewvc?rev=947612&view=rev
Log:
Further 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/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=947612&r1=947611&r2=947612&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 24 11:52:00 2010
@@ -68,12 +68,6 @@ PATCHES PROPOSED TO BACKPORT:
     code of JNDIRealm that does not manifest itself and can be left as an
     API comment.
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
-  Take 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: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48843
   Port deadlock prevention for worker allocation from NIO to BIO and APR
   https://issues.apache.org/bugzilla/attachment.cgi?id=25225

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=947612&r1=947611&r2=947612&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Mon May 24 11:52:00
2010
@@ -1716,6 +1716,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message