314840: test and fix

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java
index a0edd7e22577602c884920b6b739c197b99e8b08..2ae787e50392ea3589f23f2b1d00cb9e7bd0a8b6 100644 (file)
--- 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) {