slowly merging in optimizations

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
index 8cc4121f8ccde7378192bef649c384781402f264..8622c9f7006bfeebfcbb71ff97156bf907ac2754 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
@@ -1135,7 +1135,7 @@ public class BcelTypeMunger extends ConcreteTypeMunger {
                if (!alreadyDone) {
                        // Use the iterator form of 'getMethods()' so we do as little work
                        // as necessary
-                       for (Iterator iter = onType.getSuperclass().getMethods(); iter.hasNext() && !quitRightNow;) {
+                       for (Iterator iter = onType.getSuperclass().getMethods(true, true); iter.hasNext() && !quitRightNow;) {
                                ResolvedMember aMethod = (ResolvedMember) iter.next();
                                if (aMethod.getName().equals(localMethodName) && aMethod.getParameterSignature().equals(localParameterSig)) {
                                        // check the return types, if they are different we need a

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelWorld.java b/weaver/src/org/aspectj/weaver/bcel/BcelWorld.java
index 853d6aeb56002ca43c245736b5da4326331b0b27..c2c60a8e2b39cd484cff1564b9cd7b76605e458f 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/BcelWorld.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelWorld.java
@@ -551,7 +551,7 @@ public class BcelWorld extends World implements Repository {
                if (ii.opcode == Constants.INVOKESTATIC) {
                        ResolvedType appearsDeclaredBy = resolve(declaring);
                        // look for the method there
-                       for (Iterator<ResolvedMember> iterator = appearsDeclaredBy.getMethods(); iterator.hasNext();) {
+                       for (Iterator<ResolvedMember> iterator = appearsDeclaredBy.getMethods(true, true); iterator.hasNext();) {
                                ResolvedMember method = iterator.next();
                                if (method.isStatic()) {
                                        if (name.equals(method.getName()) && signature.equals(method.getSignature())) {