Complete fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48701

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

diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index 1417564..a3375a1 100644 (file)
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -1726,9 +1726,12 @@ class Generator {
                     TagVariableInfo tagInfo = tagInfos[i];
                     if (tagInfo != null) {
                         String name = tagInfo.getNameGiven();
-                        if (name != null) {
-                            pageInfo.getVarInfoNames().add(name);
+                        if (name == null) {
+                            String nameFromAttribute =
+                                tagInfo.getNameFromAttribute();
+                            name = n.getAttributeValue(nameFromAttribute);
                         }
+                        pageInfo.getVarInfoNames().add(name);
                     }
                 }
             }