- Cleanup.

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

diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index 6532f27..c545fcc 100644 (file)
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -2774,7 +2774,6 @@ class Generator {
                 StringBuffer sb = new StringBuffer(64);
 
                 TagAttributeInfo tai = attr.getTagAttributeInfo();
-                String returnType = JspUtil.toJavaSourceTypeFromTld(attr.getExpectedTypeName());
 
                 // generate elContext reference
                 sb.append(getJspContextVar());
@@ -2817,7 +2816,7 @@ class Generator {
                     }
                     sb.append(quote(attrValue));
                     sb.append(',');
-                    sb.append(returnType);
+                    sb.append(JspUtil.toJavaSourceTypeFromTld(attr.getExpectedTypeName()));
                     sb.append("))");
                     // should the expression be evaluated before passing to
                     // the setter?
@@ -2849,7 +2848,7 @@ class Generator {
                     sb.append(',');
                     sb.append(quote(attrValue));
                     sb.append(',');
-                    sb.append(returnType);
+                    sb.append(JspUtil.toJavaSourceTypeFromTld(attr.getExpectedTypeName()));
                     sb.append(',');
                     sb.append("new Class[] {");