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

[markt]

Author: markt
Date: Wed Sep 10 21:58:09 2014
New Revision: 1624143

URL: http://svn.apache.org/r1624143
Log:
Remove unused code (ConstantMethodHandle)

Removed:
    
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.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=1624143&r1=1624142&r2=1624143&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 21:58:09 2014
@@ -117,7 +117,8 @@ public abstract class Constant implement
             case Constants.CONSTANT_Utf8:
                 return ConstantUtf8.getInstance(file);
             case Constants.CONSTANT_MethodHandle:
-                return new ConstantMethodHandle(file);
+                Utility.swallowConstantMethodHandle(file);
+                return null;
             case Constants.CONSTANT_MethodType:
                 return new ConstantMethodType(file);
             case Constants.CONSTANT_InvokeDynamic:

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=1624143&r1=1624142&r2=1624143&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 21:58:09 2014
@@ -272,4 +272,9 @@ final class Utility {
         file.readUnsignedShort();   // Unused class index
         file.readUnsignedShort();   // Unused name and type index
     }
+
+    static void swallowConstantMethodHandle(DataInput file) throws IOException 
{
+        file.readUnsignedByte();    // Unused reference_kind
+        file.readUnsignedShort();   // Unused reference_index
+    }
 }



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