diff options
| author | aclement <aclement> | 2009-11-07 23:51:15 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2009-11-07 23:51:15 +0000 |
| commit | 6c59333620d99c4eed53c17f70d9ba66d157bf64 (patch) | |
| tree | eed27e8d7c79977b0da9c7db44c931aee7ec5656 /weaver | |
| parent | 6ecb02bddcd254d8d927bf44aae6614f5bd89049 (diff) | |
| download | aspectj-6c59333620d99c4eed53c17f70d9ba66d157bf64.tar.gz aspectj-6c59333620d99c4eed53c17f70d9ba66d157bf64.zip | |
slowly merging in optimizations
Diffstat (limited to 'weaver')
| -rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java | 2 | ||||
| -rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/BcelWorld.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java index 8cc4121f8..8622c9f70 100644 --- 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 853d6aeb5..c2c60a8e2 100644 --- 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())) { |