Author: kkolinko
Date: Mon Apr 28 11:51:52 2014
New Revision: 1590612
URL: http://svn.apache.org/r1590612
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334
Merged r1590604 from tomcat/trunk:
Reviewing r1587887:
s/ attrs.getValue(i) / attributeValue / in the messages as well,
so that the actual expression text that is processed is printed in the message.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1590604
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java?rev=1590612&r1=1590611&r2=1590612&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java Mon Apr
28 11:51:52 2014
@@ -1196,7 +1196,7 @@ class Validator {
} catch (Exception e) {
err.jspError
(n, "jsp.error.coerce_to_type",
- tldAttr.getName(),
expectedType, attrs.getValue(i));
+ tldAttr.getName(),
expectedType, attributeValue);
}
}
}
@@ -1232,7 +1232,7 @@ class Validator {
} catch (ELException e) {
this.err.jspError(n.getStart(),
"jsp.error.invalid.expression",
- attrs.getValue(i),
e.toString());
+ attributeValue, e.toString());
}
} else {
// Runtime expression
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
