Author: markt
Date: Thu Mar 20 13:53:56 2014
New Revision: 1579626
URL: http://svn.apache.org/r1579626
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/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java?rev=1579626&r1=1579625&r2=1579626&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java Thu Mar 20
13:53:56 2014
@@ -395,18 +395,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/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1579626&r1=1579625&r2=1579626&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Mar 20 13:53:56 2014
@@ -45,6 +45,14 @@
issues to not "pop up" wrt. others).
-->
<section name="Tomcat 8.0.5 (markt)">
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>54475</bug>: Add Java 8 support to SMAP generation for JSPs. Patch
+ by Robbie Gibson. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 8.0.4 (markt)">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
