Author: markt Date: Sat Nov 9 21:37:39 2013 New Revision: 1540401 URL: http://svn.apache.org/r1540401 Log: Remove StackMapEntry. Swallow associated values as they are never used.
Removed: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java?rev=1540401&r1=1540400&r2=1540401&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java Sat Nov 9 21:37:39 2013 @@ -32,14 +32,10 @@ import java.io.IOException; * @version $Id$ * @author <A HREF="mailto:m.d...@gmx.de">M. Dahm</A> * @see Code - * @see StackMapEntry */ public final class StackMap extends Attribute { private static final long serialVersionUID = 264958819110329590L; - private int map_length; - private StackMapEntry[] map; // Table of stack map entries - /** * Construct object from file stream. @@ -52,10 +48,9 @@ public final class StackMap extends Attr StackMap(int name_index, int length, DataInputStream file, ConstantPool constant_pool) throws IOException { super(name_index, length, constant_pool); - map_length = file.readUnsignedShort(); - map = new StackMapEntry[map_length]; + int map_length = file.readUnsignedShort(); for (int i = 0; i < map_length; i++) { - map[i] = new StackMapEntry(file); + Utility.swallowStackMapEntry(file); } } } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java?rev=1540401&r1=1540400&r2=1540401&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java Sat Nov 9 21:37:39 2013 @@ -32,7 +32,6 @@ import java.io.IOException; * @version $Id$ * @author <A HREF="mailto:m.d...@gmx.de">M. Dahm</A> * @see Code - * @see StackMapEntry */ public final class StackMapTable extends Attribute { Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java?rev=1540401&r1=1540400&r2=1540401&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java Sat Nov 9 21:37:39 2013 @@ -132,6 +132,18 @@ public abstract class Utility { } } + protected static void swallowStackMapEntry(DataInput file) throws IOException { + file.readShort(); // Unused byte_code_offset + int number_of_locals = file.readShort(); + for (int i = 0; i < number_of_locals; i++) { + Utility.swallowStackMapType(file); + } + int number_of_stack_items = file.readShort(); + for (int i = 0; i < number_of_stack_items; i++) { + Utility.swallowStackMapType(file); + } + } + protected static void swallowStackMapTableEntry(DataInputStream file) throws IOException { int frame_type = file.read(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org