svn commit: r1624155 - in /tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile: Constant.java ConstantInvokeDynamic.java Utility.java

[markt]

Author: markt
Date: Wed Sep 10 22:20:57 2014
New Revision: 1624155

URL: http://svn.apache.org/r1624155
Log:
Remove unused code (ConstantInvokeDynamic)

Removed:
    
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
Modified:
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java?rev=1624155&r1=1624154&r2=1624155&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java Wed 
Sep 10 22:20:57 2014
@@ -125,7 +125,8 @@ public abstract class Constant implement
                 Utility.swallowConstantMethodType(file);
                 return null;
             case Constants.CONSTANT_InvokeDynamic:
-                return new ConstantInvokeDynamic(file);
+                Utility.swallowConstantInvokeDynamic(file);
+                return null;
             default:
                 throw new ClassFormatException("Invalid byte tag in constant 
pool: " + b);
         }

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=1624155&r1=1624154&r2=1624155&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 Wed 
Sep 10 22:20:57 2014
@@ -290,4 +290,9 @@ final class Utility {
     static void swallowConstantMethodType(DataInput file) throws IOException {
         file.readUnsignedShort();   // Unused descriptor_index
     }
+
+    static void swallowConstantInvokeDynamic(DataInput file) throws 
IOException {
+        file.readUnsignedShort();   // Unused bootstrap_method_attr_index
+        file.readUnsignedShort();   // Unused name_and_type_index
+    }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org