diff options
| author | avasseur <avasseur> | 2005-12-19 15:06:51 +0000 |
|---|---|---|
| committer | avasseur <avasseur> | 2005-12-19 15:06:51 +0000 |
| commit | 3509955887685ee99cf2772426bcf74cd3a6e5cb (patch) | |
| tree | e76f4e7e4808ed9794c3233f21ad6e74ad07436c /weaver | |
| parent | d9f510b94403fe2d97ef5f124a698cef72e6319b (diff) | |
| download | aspectj-3509955887685ee99cf2772426bcf74cd3a6e5cb.tar.gz aspectj-3509955887685ee99cf2772426bcf74cd3a6e5cb.zip | |
fix NPE in mixing style (can be in concrete aspect from code style as well)
Diffstat (limited to 'weaver')
| -rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java b/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java index e6f0d88c8..5d6a5fcb6 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java @@ -454,11 +454,14 @@ public class BcelAdvice extends Advice { } } else if (hasExtraParameter()) { previousIsClosure = false; - extraVar.appendLoadAndConvert( - il, - fact, - getExtraParameterType().resolve(world)); - } else { + //extra var can be null here (@Aj aspect extends abstract code style, advice in code style) + if (extraVar != null) { + extraVar.appendLoadAndConvert( + il, + fact, + getExtraParameterType().resolve(world)); + } + } else { previousIsClosure = false; getConcreteAspect().getWorld().getMessageHandler().handleMessage( new Message( |