From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 9 Mar 2010 15:01:05 +0000 (+0000)
Subject: Review feedback
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f15109422273ec83d7bea60ece7fa41a90c7e28b;p=tomcat7.0

Review feedback
1. getNameFromAttribute() returns the attribute name, not the variable name and
2. This is a translation time test so the attribute value is not known

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@920907 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index d761cf6e6..141756422 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -1725,11 +1725,10 @@ class Generator {
                 for (int i = 0; i < tagInfos.length; i++) {
                     TagVariableInfo tagInfo = tagInfos[i];
                     if (tagInfo != null) {
-                        String name = tagInfo.getNameFromAttribute();
-                        if (name == null) {
-                            name = tagInfo.getNameGiven();
+                        String name = tagInfo.getNameGiven();
+                        if (name != null) {
+                            pageInfo.getVarInfoNames().add(name);
                         }
-                        pageInfo.getVarInfoNames().add(name);
                     }
                 }
             }