Author: kkolinko Date: Sat Jun 13 13:10:33 2009 New Revision: 784387 URL: http://svn.apache.org/viewvc?rev=784387&view=rev Log: Remove unneeded unescaping from JspUtil.getExprInXml (It is a part of the rev.696061 of trunk that was forgotten when applying it to tc6.0 in rev.708165)
Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=784387&r1=784386&r2=784387&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun 13 13:10:33 2009 @@ -138,16 +138,6 @@ ) -1: -* Remove unneeded unescaping from JspUtil.getExprInXml - http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java?r1=696061&r2=696060&pathrev=696061 - (It is a part of the following revision of trunk - http://svn.apache.org/viewvc?view=rev&revision=696061 - that was forgotten when applying it to tc6.0 in - http://svn.apache.org/viewvc?view=rev&revision=708165 - ) - +1: kkolinko, markt, fhanik - -1: - * Add Executor JMX stats http://svn.apache.org/viewvc?rev=783474&view=rev +1: fhanik, markt Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java?rev=784387&r1=784386&r2=784387&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java Sat Jun 13 13:10:33 2009 @@ -193,7 +193,7 @@ returnString = expression; } - return escapeXml(returnString.replace(Constants.ESC, '$')); + return escapeXml(returnString); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org