From: aclement <aclement>
Date: Fri, 28 May 2010 20:51:44 +0000 (+0000)
Subject: 314840: test and fix
X-Git-Tag: PRE_PUSHIN~11
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=892b919484658dab5a06f00b84767131491c3cca;p=aspectj.git

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 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) {