You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2015/08/12 12:57:54 UTC
svn commit: r1695473 - in
/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6:
classfile/Attribute.java generic/ReferenceType.java
Author: sebb
Date: Wed Aug 12 10:57:54 2015
New Revision: 1695473
URL: http://svn.apache.org/r1695473
Log:
BCEL-231 Remove deprecated methods and classes
Part 1 (of several)
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReferenceType.java
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java?rev=1695473&r1=1695472&r2=1695473&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java Wed Aug 12 10:57:54 2015
@@ -195,10 +195,6 @@ public abstract class Attribute implemen
{
return ((UnknownAttributeReader) r).createAttribute(name_index, length, file, constant_pool);
}
- else if (r instanceof AttributeReader && file instanceof DataInputStream)
- {
- return ((AttributeReader) r).createAttribute(name_index, length, (DataInputStream) file, constant_pool);
- }
return new Unknown(name_index, length, file, constant_pool);
case Constants.ATTR_CONSTANT_VALUE:
return new ConstantValue(name_index, length, file, constant_pool);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReferenceType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReferenceType.java?rev=1695473&r1=1695472&r2=1695473&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReferenceType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReferenceType.java Wed Aug 12 10:57:54 2015
@@ -226,8 +226,8 @@ public abstract class ReferenceType exte
return Type.OBJECT;
// TODO: Is there a proof of OBJECT being the direct ancestor of every ArrayType?
}
- if (((this instanceof ObjectType) && ((ObjectType) this).referencesInterface())
- || ((t instanceof ObjectType) && ((ObjectType) t).referencesInterface())) {
+ if (((this instanceof ObjectType) && ((ObjectType) this).referencesInterfaceExact())
+ || ((t instanceof ObjectType) && ((ObjectType) t).referencesInterfaceExact())) {
return Type.OBJECT;
// TODO: The above line is correct comparing to the vmspec2. But one could
// make class file verification a bit stronger here by using the notion of