generics: dont assume bcelmethod, it cant be resolvedmember

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
index 01d6d7e70e707bee76cb933e1a6c3c8e0fb7d6e9..254033f03e0c290c5f07e5117617e81d02299140 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
@@ -213,10 +213,10 @@ public class BcelTypeMunger extends ConcreteTypeMunger {
             for (Iterator i = methods.iterator(); i.hasNext();) {
                 BcelMethod o = (BcelMethod)i.next();
                 if (o.isAbstract() && !o.getName().startsWith("ajc$interField")) { // Ignore abstract methods of ajc$interField prefixed methods
-                    BcelMethod discoveredImpl = null;
+                    ResolvedMember discoveredImpl = null;
                     List newParentTargetMethods = newParentTarget.getType().getMethodsWithoutIterator();
                     for (Iterator ii = newParentTargetMethods.iterator(); ii.hasNext() && discoveredImpl==null;) {
-                        BcelMethod gen2 = (BcelMethod) ii.next();
+                        ResolvedMember gen2 = (ResolvedMember) ii.next();
                         if (gen2.getName().equals(o.getName()) && 
                             gen2.getParameterSignature().equals(o.getParameterSignature()) && !gen2.isAbstract()) {
                             discoveredImpl = gen2; // Found a valid implementation !