fixes for 91859 - enable us to preserve the set of annotations originally declared...

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
index cb5d706e1bf5a6abb8cf85569e696dba61c2573e..e743af75e5143a66883bbd78aad53daa2bd9b00a 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
@@ -782,9 +782,10 @@ public class AjLookupEnvironment extends LookupEnvironment implements AnonymousC
                }
                
                // Build a new array of annotations
-               // FIXME asc Should be caching the old set of annotations in the type so the class file
-               // generated doesn't have the annotation, it will then be added again during
-               // binary weaving? (similar to declare parents handling...)
+               
+               // remember the current set (rememberAnnotations only does something the first time it is called for a type)
+               sourceType.scope.referenceContext.rememberAnnotations(); 
+               
                AsmRelationshipProvider.getDefault().addDeclareAnnotationRelationship(decA.getSourceLocation(),rtx.getSourceLocation());
                Annotation abefore[] = sourceType.scope.referenceContext.annotations;
                Annotation[] newset = new Annotation[toAdd.length+(abefore==null?0:abefore.length)];