summaryrefslogtreecommitdiffstats
path: root/weaver
diff options
context:
space:
mode:
authoraclement <aclement>2006-04-26 16:45:17 +0000
committeraclement <aclement>2006-04-26 16:45:17 +0000
commitc667bcb5088379d74b89c3dc8556b87429e4efb7 (patch)
treee9d296ba9f3347c7484fe2a35445b1956d3f4068 /weaver
parent99882cb91a94c468c185cf11cd6a728604e95bdb (diff)
downloadaspectj-c667bcb5088379d74b89c3dc8556b87429e4efb7.tar.gz
aspectj-c667bcb5088379d74b89c3dc8556b87429e4efb7.zip
test and fix for 138286
Diffstat (limited to 'weaver')
-rw-r--r--weaver/src/org/aspectj/weaver/patterns/PerThisOrTargetPointcutVisitor.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/weaver/src/org/aspectj/weaver/patterns/PerThisOrTargetPointcutVisitor.java b/weaver/src/org/aspectj/weaver/patterns/PerThisOrTargetPointcutVisitor.java
index 0d3cb2a5f..8a6665df2 100644
--- a/weaver/src/org/aspectj/weaver/patterns/PerThisOrTargetPointcutVisitor.java
+++ b/weaver/src/org/aspectj/weaver/patterns/PerThisOrTargetPointcutVisitor.java
@@ -67,7 +67,7 @@ public class PerThisOrTargetPointcutVisitor extends IdentityPointcutVisitor {
if (m_isTarget) {
return MAYBE;
} else {
- return node.getAnnotationTypePattern();
+ return new AnyWithAnnotationTypePattern( node.getAnnotationTypePattern());
}
}
@@ -125,9 +125,9 @@ public class PerThisOrTargetPointcutVisitor extends IdentityPointcutVisitor {
public Object visit(ThisOrTargetAnnotationPointcut node, Object data) {
if (m_isTarget && !node.isThis()) {
- return node.getAnnotationTypePattern();
+ return new AnyWithAnnotationTypePattern( node.getAnnotationTypePattern());
} else if (!m_isTarget && node.isThis()) {
- return node.getAnnotationTypePattern();
+ return new AnyWithAnnotationTypePattern( node.getAnnotationTypePattern());
} else {
// perthis(@target(Foo))
return MAYBE;