Author: markt Date: Thu Oct 25 12:16:22 2012 New Revision: 1402123 URL: http://svn.apache.org/viewvc?rev=1402123&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54017 Simplify and reduce GC.
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1402122 Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1402123&r1=1402122&r2=1402123&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Thu Oct 25 12:16:22 2012 @@ -3176,7 +3176,7 @@ class Generator { } else if (c == Long.class) { return JspUtil.coerceToLong(s, isNamedAttribute); } else if (c == Object.class) { - return "new String(" + quoted + ")"; + return quoted; } else { String className = c.getCanonicalName(); return "(" 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=1402123&r1=1402122&r2=1402123&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct 25 12:16:22 2012 @@ -97,6 +97,10 @@ the <code><c:set></code> triggered a JSP compilation error when used in a tag file. Based on a patch provided by Sheldon Shao. (markt) </fix> + <scode> + <bug>54017</bug>: Simplify coercion of <code>String</code> instances to + <code>Object</code>. (markt) + </scode> </changelog> </subsection> <subsection name="Cluster"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org