Author: markt Date: Sun Aug 26 22:26:10 2012 New Revision: 1377534 URL: http://svn.apache.org/viewvc?rev=1377534&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53735 Merge updates from Commons BCEL that provide the limited Java 7 support required for Tomcat's cut-down BCEL fork.
Added: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java - copied unchanged from r1377532, tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java - copied unchanged from r1377532, tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java - copied unchanged from r1377532, tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1377532 Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java?rev=1377534&r1=1377533&r2=1377534&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java Sun Aug 26 22:26:10 2012 @@ -94,13 +94,23 @@ public interface Constants { /** Marks a constant pool entry as a name and type. */ public static final byte CONSTANT_NameAndType = 12; + /** Marks a constant pool entry as a Method Handle. */ + public static final byte CONSTANT_MethodHandle = 15; + + /** Marks a constant pool entry as a Method Type. */ + public static final byte CONSTANT_MethodType = 16; + + /** Marks a constant pool entry as an Invoke Dynamic */ + public static final byte CONSTANT_InvokeDynamic = 18; + /** The names of the types of entries in a constant pool. */ public static final String[] CONSTANT_NAMES = { "", "CONSTANT_Utf8", "", "CONSTANT_Integer", "CONSTANT_Float", "CONSTANT_Long", "CONSTANT_Double", "CONSTANT_Class", "CONSTANT_String", "CONSTANT_Fieldref", "CONSTANT_Methodref", "CONSTANT_InterfaceMethodref", - "CONSTANT_NameAndType" }; + "CONSTANT_NameAndType", "CONSTANT_MethodHandle", + "CONSTANT_MethodType", "CONSTANT_InvokeDynamic" }; /** Java VM opcode. * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */ Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java?rev=1377534&r1=1377533&r2=1377534&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java Sun Aug 26 22:26:10 2012 @@ -123,6 +123,12 @@ public abstract class Constant implement return new ConstantNameAndType(file); case Constants.CONSTANT_Utf8: return new ConstantUtf8(file); + case Constants.CONSTANT_MethodHandle: + return new ConstantMethodHandle(file); + case Constants.CONSTANT_MethodType: + return new ConstantMethodType(file); + case Constants.CONSTANT_InvokeDynamic: + return new ConstantInvokeDynamic(file); default: throw new ClassFormatException("Invalid byte tag in constant pool: " + b); } 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=1377534&r1=1377533&r2=1377534&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Aug 26 22:26:10 2012 @@ -265,6 +265,11 @@ Remove some unused code from Tomcat's package renamed, cut-down copy of Commons BCEL used for annotation scanning. (markt) </scode> + <add> + <bug>53735</bug>Add support for Java 7 byte code to Tomcat's + package renamed, cut-down copy of Commons BCEL used for annotation + scanning. (markt) + </add> </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org