diff options
| author | aclement <aclement> | 2010-05-28 20:51:44 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2010-05-28 20:51:44 +0000 |
| commit | 892b919484658dab5a06f00b84767131491c3cca (patch) | |
| tree | aa3eb3b538af525af82c6b8038edeae87f49a357 /weaver | |
| parent | ae2c1d7e25dbacbfe10374bb02caa9d0ae47642a (diff) | |
| download | aspectj-892b919484658dab5a06f00b84767131491c3cca.tar.gz aspectj-892b919484658dab5a06f00b84767131491c3cca.zip | |
314840: test and fix
Diffstat (limited to 'weaver')
| -rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java index a0edd7e22..2ae787e50 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java @@ -609,8 +609,9 @@ public class BcelWeaver { // an @AJ aspect (it could have been inherited from a code // style aspect) then // evaluate the alternative set of formals. pr125699 - if (advice.getConcreteAspect().isAnnotationStyleAspect() && advice.getDeclaringAspect() != null - && advice.getDeclaringAspect().resolve(world).isAnnotationStyleAspect()) { + if ((advice.getConcreteAspect().isAnnotationStyleAspect() && advice.getDeclaringAspect() != null && advice + .getDeclaringAspect().resolve(world).isAnnotationStyleAspect()) + || advice.isAnnotationStyle()) { numFormals = advice.getBaseParameterCount(); int numArgs = advice.getSignature().getParameterTypes().length; if (numFormals > 0) { |