fixed 404848

2 files changed, 22 insertions, 3 deletions

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMember.java b/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMember.java
index 60d322410..0b5def29a 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMember.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMember.java
@@ -153,4 +153,6 @@ public interface ResolvedMember extends Member, AnnotatedElement, TypeVariableDe
 
 	public boolean isDefaultConstructor();
 
+	public void setAnnotations(AnnotationAJ[] annotations);
+
 }
\ No newline at end of file
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java b/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java
index 6ddf51bb5..cfd0508c4 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java
@@ -321,9 +321,29 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Reso
 		if (backingGenericMember != null) {
 			return backingGenericMember.getAnnotations();
 		}
+		if (annotations!=null) {
+			return annotations;
+		}
 		return super.getAnnotations();
 	}
 
+	public AnnotationAJ getAnnotationOfType(UnresolvedType ofType) {
+		if (annotations!=null) {
+			// this means they have been set (we are likely a placeholder for an ITD, so a fake member)
+			for (AnnotationAJ annotation: annotations) {
+				if (annotation.getType().equals(ofType)) {
+					return annotation;
+				}
+			}
+			return null;
+		}
+		throw new UnsupportedOperationException("You should resolve this member and call getAnnotationOfType() on the result...");
+	}
+	
+	public void setAnnotations(AnnotationAJ[] annotations) {
+		this.annotations = annotations;
+	}
+
 	public void setAnnotationTypes(ResolvedType[] annotationTypes) {
 		this.annotationTypes = annotationTypes;
 	}
@@ -1235,9 +1255,6 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Reso
 	public void evictWeavingState() {
 	}
 
-	public AnnotationAJ getAnnotationOfType(UnresolvedType ofType) {
-		throw new UnsupportedOperationException("You should resolve this member and call getAnnotationOfType() on the result...");
-	}
 
 	public boolean isEquivalentTo(Object other) {
 		return this.equals(other);