From f19d0c99af300388a4d01437f53dc168bb9307eb Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Thu, 19 Jun 2014 16:55:49 -0700 Subject: [PATCH] 433351: second part of the fix: cope with PTBs for parent weaving --- .../ajdt/internal/compiler/lookup/AjLookupEnvironment.java | 3 +++ 1 file changed, 3 insertions(+) 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 22e8fdf0d..e296c7438 100644 --- 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 @@ -420,6 +420,9 @@ public class AjLookupEnvironment extends LookupEnvironment implements AnonymousC weaveIntertypes(typesToProcess, (SourceTypeBinding) binding, typeMungers, declareParents, declareAnnotationOnTypes, mode); } + else if (binding instanceof ParameterizedTypeBinding && (((ParameterizedTypeBinding)binding).type instanceof SourceTypeBinding) && typesToProcess.contains(((ParameterizedTypeBinding)binding).type)) { + weaveIntertypes(typesToProcess, (SourceTypeBinding) ((ParameterizedTypeBinding)binding).type, typeMungers, declareParents, declareAnnotationOnTypes, mode); + } } weaveInterTypeDeclarations(typeToWeave, typeMungers, declareParents, declareAnnotationOnTypes, false, mode); typesToProcess.remove(typeToWeave); -- 2.39.5