diff options
| author | aclement <aclement> | 2008-06-17 20:29:36 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2008-06-17 20:29:36 +0000 |
| commit | 2fd8894377f7d2515a00f7dd73ec30f90d333cb1 (patch) | |
| tree | 1f05298f88722d4b7af2d3e09ac902dd3e8f140b /weaver/src | |
| parent | 204bbed5a8dc6f324b1a6b904434f09cb49e6aa6 (diff) | |
| download | aspectj-2fd8894377f7d2515a00f7dd73ec30f90d333cb1.tar.gz aspectj-2fd8894377f7d2515a00f7dd73ec30f90d333cb1.zip | |
237381: fix: allow deow annotations in code style aspect
Diffstat (limited to 'weaver/src')
| -rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/AtAjAttributes.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/weaver/src/org/aspectj/weaver/bcel/AtAjAttributes.java b/weaver/src/org/aspectj/weaver/bcel/AtAjAttributes.java index d1fde99ec..db0ca8bec 100644 --- a/weaver/src/org/aspectj/weaver/bcel/AtAjAttributes.java +++ b/weaver/src/org/aspectj/weaver/bcel/AtAjAttributes.java @@ -246,8 +246,8 @@ public class AtAjAttributes { } // the following block will not detect @Pointcut in non @Aspect types for optimization purpose - if (!hasAtAspectAnnotation && !containsPointcut) { - return EMPTY_LIST; + if (!(hasAtAspectAnnotation || isCodeStyleAspect) && !containsPointcut) { + return EMPTY_LIST; } //FIXME AV - turn on when ajcMightHaveAspect @@ -323,7 +323,7 @@ public class AtAjAttributes { if (handleDeclareErrorOrWarningAnnotation(frvs, fstruct) || handleDeclareParentsAnnotation(frvs, fstruct)) { // semantic check - must be in an @Aspect [remove if previous block bypassed in advance] - if (!type.isAnnotationStyleAspect()) { + if (!type.isAnnotationStyleAspect() && !isCodeStyleAspect) { msgHandler.handleMessage( new Message( "Found @AspectJ annotations in a non @Aspect type '" + type.getName() + "'", |