Author: markt
Date: Tue Dec 22 21:17:41 2009
New Revision: 893321
URL: http://svn.apache.org/viewvc?rev=893321&view=rev
Log:
Fix regression (JSP TCK failure) with fix for bug 47453
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java?rev=893321&r1=893320&r2=893321&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Tue Dec 22
21:17:41 2009
@@ -1134,6 +1134,14 @@
} else {
expectedType = "java.lang.Object";
}
+ if ("void".equals(expectedType)) {
+ // Can't specify a literal for a
+ // deferred method with an expected
type
+ // of void - JSP.2.3.4
+ err.jspError(n,
+ "jsp.error.literal_with_void",
+ tldAttrs[j].getName());
+ }
}
if (tldAttrs[j].isDeferredValue()) {
// The String literal must be castable to
what is declared as type
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=893321&r1=893320&r2=893321&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Tue
Dec 22 21:17:41 2009
@@ -351,6 +351,7 @@
jsp.error.var_and_varReader=Only one of \'var\' or \'varReader\' may be
specified
jsp.error.missing_var_or_varReader=Missing \'var\' or \'varReader\' attribute
jsp.warning.bad.urlpattern.propertygroup=Bad value {0} in the url-pattern
subelement in web.xml
+jsp.error.literal_with_void=A literal value was specified for attribute {0}
that is defined as a deferred method with a return type of void. JSP.2.3.4 does
not permit literal values in this case
jsp.error.unknown_attribute_type=Unknown attribute type ({1}) for attribute
{0}.
jsp.error.coerce_to_type=Cannot coerce value ({2}) to type ({1}) for attribute
{0}.
jsp.error.jspelement.missing.name=Mandatory XML-style \'name\' attribute
missing
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
