test and fix for 169706: inherited annotations down a hierarchy greater than 2 deep

diff --git a/weaver/src/org/aspectj/weaver/ResolvedType.java b/weaver/src/org/aspectj/weaver/ResolvedType.java
index a9e52a14a5252902c7da293eec1c073843f4eeb3..be05dd0a7c662cb73fc296f0b3e45478119f1035 100644 (file)
--- 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;