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

[markt]

Author: markt
Date: Sat Nov  9 21:43:34 2013
New Revision: 1540410

URL: http://svn.apache.org/r1540410
Log:
Remove Signature.
Swallow associated values as they are never used.

Removed:
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.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=1540410&r1=1540409&r2=1540410&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 Sat 
Nov  9 21:43:34 2013
@@ -42,7 +42,6 @@ import org.apache.tomcat.util.bcel.Const
  * @see InnerClasses
  * @see Synthetic
  * @see Deprecated
- * @see Signature
  */
 public abstract class Attribute implements Cloneable, Serializable
 {
@@ -126,7 +125,8 @@ public abstract class Attribute implemen
         case Constants.ATTR_PMG:
             return new PMGClass(name_index, length, file, constant_pool);
         case Constants.ATTR_SIGNATURE:
-            return new Signature(name_index, length, file, constant_pool);
+            Utility.swallowSignature(file);
+            return null;
         case Constants.ATTR_STACK_MAP:
             Utility.swallowStackMap(file);
             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=1540410&r1=1540409&r2=1540410&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:43:34 2013
@@ -158,4 +158,8 @@ final class Utility {
             file.readFully(bytes);
         }
     }
+
+    static void swallowSignature(DataInput file) throws IOException {
+        file.readUnsignedShort();   // Unused signature_index
+    }
 }



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