Author: markt Date: Thu Mar 20 15:24:50 2014 New Revision: 1579662 URL: http://svn.apache.org/r1579662 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54475 Add Java 8 support to SMAP generation for JSPs. Patch by Robbie Gibson.
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1579626 Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java?rev=1579662&r1=1579661&r2=1579662&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java Thu Mar 20 15:24:50 2014 @@ -392,18 +392,25 @@ public class SmapUtil { int tag = readU1(); writeU1(tag); switch (tag) { - case 7 : // Class - case 8 : // String + case 7 : // Class + case 8 : // String + case 16 : // MethodType if (log.isDebugEnabled()) log.debug(i + " copying 2 bytes"); copy(2); break; - case 9 : // Field + case 15 : // MethodHandle + if (log.isDebugEnabled()) + log.debug(i + " copying 3 bytes"); + copy(3); + break; + case 9 : // Field case 10 : // Method case 11 : // InterfaceMethod - case 3 : // Integer - case 4 : // Float + case 3 : // Integer + case 4 : // Float case 12 : // NameAndType + case 18 : // InvokeDynamic if (log.isDebugEnabled()) log.debug(i + " copying 4 bytes"); copy(4); 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=1579662&r1=1579661&r2=1579662&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar 20 15:24:50 2014 @@ -55,6 +55,7 @@ They eventually become mixed with the numbered issues. (I.e., numbered issues to not "pop up" wrt. others). --> +<<<<<<< .working <section name="Tomcat 7.0.53 (violetagg)"> <subsection name="Catalina"> <changelog> @@ -129,6 +130,10 @@ <subsection name="Jasper"> <changelog> <fix> + <bug>54475</bug>: Add Java 8 support to SMAP generation for JSPs. Patch + by Robbie Gibson. (markt) + </fix> + <fix> <bug>55483</bug>: Improve handing of overloaded methods and constructors in expression language implementation. (markt) </fix> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org