diff options
author | aclement <aclement> | 2006-02-21 15:55:33 +0000 |
---|---|---|
committer | aclement <aclement> | 2006-02-21 15:55:33 +0000 |
commit | ba42a09551519a4b611ab06edb161ecb0c629f53 (patch) | |
tree | 2169f72dba31201d2c32fb6d39118c57e0869ef6 /weaver | |
parent | 7a2087ef985e8af73045bac1e7e0195bb87c7f40 (diff) | |
download | aspectj-ba42a09551519a4b611ab06edb161ecb0c629f53.tar.gz aspectj-ba42a09551519a4b611ab06edb161ecb0c629f53.zip |
test and fix for 128237 from Helen
Diffstat (limited to 'weaver')
-rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java index 118e7bfee..31dbacd0a 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java @@ -611,7 +611,11 @@ public class BcelWeaver implements IWeaver { // if each branch binds it in exactly the same way... List ambiguousNames = new ArrayList(); for (int i = 0; i < numFormals; i++) { - if (!leftBindings[i].equals(rightBindings[i])) { + if (leftBindings[i] == null) { + if (rightBindings[i] != null) { + ambiguousNames.add(names[i]); + } + } else if (!leftBindings[i].equals(rightBindings[i])) { ambiguousNames.add(names[i]); } } |