Author: markt
Date: Sun Mar 23 09:38:50 2014
New Revision: 1580480
URL: http://svn.apache.org/r1580480
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/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1580480&r1=1580479&r2=1580480&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Mar 23 09:38:50 2014
@@ -64,13 +64,6 @@ PATCHES PROPOSED TO BACKPORT:
Thus I am OK with this change.
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54475
- Add Java 8 support to SMAP generation for JSPs.
- Patch by Robbie Gibson.
- http://people.apache.org/~markt/patches/2014-03-20-smap-java8-tc6-v1.patch
- +1: markt, kkolinko, schultz, remm
- -1:
-
PATCHES/ISSUES THAT ARE STALLED:
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java?rev=1580480&r1=1580479&r2=1580480&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java Sun Mar
23 09:38:50 2014
@@ -440,18 +440,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/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1580480&r1=1580479&r2=1580480&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Mar 23 09:38:50 2014
@@ -102,6 +102,10 @@
controls the validation of *.tld files when Jasper parses them. (markt)
</fix>
<fix>
+ <bug>54475</bug>: Add Java 8 support to SMAP generation for JSPs. Patch
+ by Robbie Gibson. (markt)
+ </fix>
+ <fix>
<bug>56010</bug>: Don't throw an
<code>IllegalArgumentException</code> when
<code>JspFactory.getPageContext</code> is used with
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
