diff options
| author | avasseur <avasseur> | 2005-06-02 07:24:04 +0000 |
|---|---|---|
| committer | avasseur <avasseur> | 2005-06-02 07:24:04 +0000 |
| commit | 2018671d8b1b876ca2b58c667c567e1d84c5cc3b (patch) | |
| tree | c71964979ee489c9e6d11533dacb571f2ac8a463 /weaver | |
| parent | 6ddf62e7848e3bddad0656eeb51d325ca7bc2b70 (diff) | |
| download | aspectj-2018671d8b1b876ca2b58c667c567e1d84c5cc3b.tar.gz aspectj-2018671d8b1b876ca2b58c667c567e1d84c5cc3b.zip | |
fix for weaver test suite where munger don't have a concrete aspect attached
Diffstat (limited to 'weaver')
| -rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java | 4 | ||||
| -rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/BcelShadow.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java b/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java index 3dc487853..d3e8e9f9a 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java @@ -361,7 +361,7 @@ public class BcelAdvice extends Advice { if (v == null) { // if not @AJ aspect, go on with the regular binding handling - if (!getConcreteAspect().isAnnotationStyleAspect()) { + if (getConcreteAspect()==null || !getConcreteAspect().isAnnotationStyleAspect()) { continue; } else { // ATAJ: for @AJ aspects, handle implicit binding of xxJoinPoint @@ -407,7 +407,7 @@ public class BcelAdvice extends Advice { // ATAJ: for code style aspect, handles the extraFlag as usual ie not // in the middle of the formal bindings but at the end, in a rock solid ordering - if (!getConcreteAspect().isAnnotationStyleAspect()) { + if (getConcreteAspect()==null || !getConcreteAspect().isAnnotationStyleAspect()) { if (getKind() == AdviceKind.Around) { il.append(closureInstantiation); } else if (hasExtraParameter()) { diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java index 4bc3daf92..2180ca921 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java @@ -2548,7 +2548,7 @@ public class BcelShadow extends Shadow { } // ATAJ for @AJ aspect we need to link the closure with the joinpoint instance - if (munger.getConcreteAspect().isAnnotationStyleAspect()) { + if (munger.getConcreteAspect()!=null && munger.getConcreteAspect().isAnnotationStyleAspect()) { closureInstantiation.append(Utility.createInvoke( getFactory(), getWorld(), |