- Avoid NPE (quick fix).

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

diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index dc2a774..6532f27 100644 (file)
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -2774,9 +2774,7 @@ class Generator {
                 StringBuffer sb = new StringBuffer(64);
 
                 TagAttributeInfo tai = attr.getTagAttributeInfo();
-                String type = tai.getTypeName();
-                String returnType = JspUtil.toJavaSourceTypeFromTld(attr
-                        .getExpectedTypeName());
+                String returnType = JspUtil.toJavaSourceTypeFromTld(attr.getExpectedTypeName());
 
                 // generate elContext reference
                 sb.append(getJspContextVar());
@@ -2807,7 +2805,7 @@ class Generator {
 
                 // depending on type
                 if (attr.isDeferredInput()
-                        || ValueExpression.class.getName().equals(type)) {
+                        || ((tai != null) && ValueExpression.class.getName().equals(tai.getTypeName()))) {
                     sb.append("new org.apache.jasper.el.JspValueExpression(");
                     sb.append(quote(mark));
                     sb.append(',');
@@ -2841,7 +2839,7 @@ class Generator {
                     }
                     attrValue = sb.toString();
                 } else if (attr.isDeferredMethodInput()
-                        || MethodExpression.class.getName().equals(type)) {
+                        || ((tai != null) && MethodExpression.class.getName().equals(tai.getTypeName()))) {
                     sb.append("new org.apache.jasper.el.JspMethodExpression(");
                     sb.append(quote(mark));
                     sb.append(',');