You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/10/24 20:25:48 UTC
svn commit: r1401813 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/jasper/tagplugins/jstl/core/Out.java
webapps/docs/changelog.xml
Author: markt
Date: Wed Oct 24 18:25:47 2012
New Revision: 1401813
URL: http://svn.apache.org/viewvc?rev=1401813&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54011
Fix copy/paste error and use correct attribute name
Value is coerced to boolean in ctx.generateAttribute() so no need for additional conversion
Patch by Sheldon Shao
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Out.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1401792,1401808
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Out.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Out.java?rev=1401813&r1=1401812&r2=1401813&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Out.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Out.java Wed Oct 24 18:25:47 2012
@@ -66,9 +66,9 @@ public final class Out implements TagPlu
//if the escapeXml is specified, assign the value to it;
ctxt.generateJavaSource("boolean " + strEscapeXmlName + " = true;");
if(hasEscapeXml){
- ctxt.generateJavaSource(strEscapeXmlName + " = Boolean.parseBoolean((");
- ctxt.generateAttribute("default");
- ctxt.generateJavaSource(").toString());");
+ ctxt.generateJavaSource(strEscapeXmlName + " = ");
+ ctxt.generateAttribute("escapeXml");
+ ctxt.generateJavaSource(";");
}
//main part.
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1401813&r1=1401812&r2=1401813&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Oct 24 18:25:47 2012
@@ -78,6 +78,12 @@
any similar sequence with a odd number of - characters) was not
correctly parsed. (markt)
</fix>
+ <fix>
+ <bug>54011</bug>: Fix a bug in the tag plug-in for
+ <code><c:out></code> that triggered a JSP compilation error if the
+ <code>escapeXml</code> attribute was used. Patch provided by Sheldon
+ Shao. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org