aboutsummaryrefslogtreecommitdiffstats
path: root/weaver
diff options
context:
space:
mode:
authoraclement <aclement>2007-01-08 15:45:40 +0000
committeraclement <aclement>2007-01-08 15:45:40 +0000
commit616672d6f7b71a5cfbff20ec698c3d812dd7fc4a (patch)
tree150e01367bf79b6733476d2691ec771c1ba1e612 /weaver
parentd7222a776d529bc84dee4d2da4796bb01b0659d9 (diff)
downloadaspectj-616672d6f7b71a5cfbff20ec698c3d812dd7fc4a.tar.gz
aspectj-616672d6f7b71a5cfbff20ec698c3d812dd7fc4a.zip
test and fix for 169706: inherited annotations down a hierarchy greater than 2 deep
Diffstat (limited to 'weaver')
-rw-r--r--weaver/src/org/aspectj/weaver/ResolvedType.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/weaver/src/org/aspectj/weaver/ResolvedType.java b/weaver/src/org/aspectj/weaver/ResolvedType.java
index a9e52a14a..be05dd0a7 100644
--- a/weaver/src/org/aspectj/weaver/ResolvedType.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedType.java
@@ -1054,8 +1054,9 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl
if (ret != null) return ret;
ResolvedType supert = getSuperclass();
- if (supert != null) {
+ while (ret==null && supert!=null) {
ret = supert.lookupMemberNoSupers(member);
+ if (ret==null) supert = supert.getSuperclass();
}
return ret;