aboutsummaryrefslogtreecommitdiffstats
path: root/weaver
diff options
context:
space:
mode:
authoraclement <aclement>2005-10-20 10:32:20 +0000
committeraclement <aclement>2005-10-20 10:32:20 +0000
commit720a6d9d5c1900b79a91d704af8c3973f6165e0d (patch)
tree3c1d187b35205707b2f61557445cbde4cb206692 /weaver
parenta07fd2951422464096ce02a682e8d02be17353ff (diff)
downloadaspectj-720a6d9d5c1900b79a91d704af8c3973f6165e0d.tar.gz
aspectj-720a6d9d5c1900b79a91d704af8c3973f6165e0d.zip
Fix for ordering problem when using generic abstract aspects. Fix for crappy code (of mine) in ResolvedType.discover... - see pr112105 comment #10
Diffstat (limited to 'weaver')
-rw-r--r--weaver/src/org/aspectj/weaver/ResolvedType.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/weaver/src/org/aspectj/weaver/ResolvedType.java b/weaver/src/org/aspectj/weaver/ResolvedType.java
index ba8271901..257cfb58c 100644
--- a/weaver/src/org/aspectj/weaver/ResolvedType.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedType.java
@@ -1288,10 +1288,10 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl
for (int i = 0; i < superIs.length; i++) {
ResolvedType superI = superIs[i];
if (superI.genericTypeEquals(lookingFor)) return superI;
- ResolvedType checkTheSuperI = discoverActualOccurrenceOfTypeInHierarchy(lookingFor);
+ ResolvedType checkTheSuperI = superI.discoverActualOccurrenceOfTypeInHierarchy(lookingFor);
if (checkTheSuperI!=null) return checkTheSuperI;
}
- return discoverActualOccurrenceOfTypeInHierarchy(superT);
+ return superT.discoverActualOccurrenceOfTypeInHierarchy(lookingFor);
}
/**