You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/09/10 22:51:54 UTC

svn commit: r1624124 - in /tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile: Attribute.java InnerClasses.java Utility.java

Author: markt
Date: Wed Sep 10 20:51:54 2014
New Revision: 1624124

URL: http://svn.apache.org/r1624124
Log:
Remove unused code (InnerClasses)

Removed:
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java
Modified:
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java?rev=1624124&r1=1624123&r2=1624124&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java Wed Sep 10 20:51:54 2014
@@ -32,7 +32,6 @@ import org.apache.tomcat.util.bcel.Const
  * attribute stands for non-standard-attributes.
  *
  * @author <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>
- * @see InnerClasses
  * @see Deprecated
  */
 public abstract class Attribute implements Cloneable, Serializable
@@ -114,7 +113,8 @@ public abstract class Attribute implemen
             Utility.swallowLocalVariableTable(file);
             return null;
         case Constants.ATTR_INNER_CLASSES:
-            return new InnerClasses(name_index, length, file, constant_pool);
+            Utility.swallowInnerClasses(file);
+            return null;
         case Constants.ATTR_SYNTHETIC:
             Utility.swallowSynthetic(file, length);
             return null;

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=1624124&r1=1624123&r2=1624124&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 20:51:54 2014
@@ -239,4 +239,11 @@ final class Utility {
             Utility.swallowLocalVariable(file);
         }
     }
+
+    static void swallowInnerClasses(DataInput file) throws IOException {
+        int number_of_classes = file.readUnsignedShort();
+        for (int i = 0; i < number_of_classes; i++) {
+            Utility.swallowInnerClass(file);
+        }
+    }
 }



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