diff options
| author | Andy Clement <aclement@vmware.com> | 2012-03-02 08:17:44 -0800 |
|---|---|---|
| committer | Andy Clement <aclement@vmware.com> | 2012-03-02 08:17:44 -0800 |
| commit | f37c56e02982a1043e7821bf033b58495f8a6b74 (patch) | |
| tree | 929ae23ef3663a073ed2f7e451faf52648386578 /weaver | |
| parent | 548f8b6a118d06874d511ffcc13602b4ec756d9a (diff) | |
| download | aspectj-f37c56e02982a1043e7821bf033b58495f8a6b74.tar.gz aspectj-f37c56e02982a1043e7821bf033b58495f8a6b74.zip | |
fix for 371998
Use resolved type pattern rather than re-resolving
Diffstat (limited to 'weaver')
| -rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/AtAjAttributes.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/weaver/src/org/aspectj/weaver/bcel/AtAjAttributes.java b/weaver/src/org/aspectj/weaver/bcel/AtAjAttributes.java index c4e519715..41f9f1ab7 100644 --- a/weaver/src/org/aspectj/weaver/bcel/AtAjAttributes.java +++ b/weaver/src/org/aspectj/weaver/bcel/AtAjAttributes.java @@ -66,7 +66,6 @@ import org.aspectj.weaver.UnresolvedType; import org.aspectj.weaver.VersionedDataInputStream; import org.aspectj.weaver.WeaverMessages; import org.aspectj.weaver.World; -import org.aspectj.weaver.patterns.Bindings; import org.aspectj.weaver.patterns.DeclareErrorOrWarning; import org.aspectj.weaver.patterns.DeclareParents; import org.aspectj.weaver.patterns.DeclareParentsMixin; @@ -735,15 +734,13 @@ public class AtAjAttributes { List<TypePattern> parents = new ArrayList<TypePattern>(1); parents.add(parent); DeclareParents dp = new DeclareParents(typePattern, parents, false); - dp.resolve(binding); // resolves the parent and child parts - // of the decp + dp.resolve(binding); // resolves the parent and child parts of the decp // resolve this so that we can use it for the // MethodDelegateMungers below. // eg. '@Coloured *' will change from a WildTypePattern to - // an 'AnyWithAnnotationTypePattern' after this - // resolution - typePattern = typePattern.resolveBindings(binding, Bindings.NONE, false, false); + // an 'AnyWithAnnotationTypePattern' after this resolution + typePattern = dp.getChild(); // this retrieves the resolved version // TODO kick ISourceLocation sl = // struct.bField.getSourceLocation(); ?? // dp.setLocation(dp.getDeclaringType().getSourceContext(), |