242797: resolve earlier so that any generic method type vars are recognized.

diff --git a/weaver/src/org/aspectj/weaver/ResolvedType.java b/weaver/src/org/aspectj/weaver/ResolvedType.java
index ed049bef3dd9f5a0f1ef40c57ee063928b9c535b..97c2f1678255364013c89c4199f2da81e0efc82a 100644 (file)
--- a/weaver/src/org/aspectj/weaver/ResolvedType.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedType.java
@@ -1648,8 +1648,8 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl
                if (world.isInJava5Mode() && parent.getKind()==Member.METHOD) {
                        
                  // Look at the generic types when doing this comparison
-             ResolvedType rtParentReturnType = parent.getGenericReturnType().resolve(world);
-                 ResolvedType rtChildReturnType  = child.getGenericReturnType().resolve(world);
+             ResolvedType rtParentReturnType = parent.resolve(world).getGenericReturnType().resolve(world);
+                 ResolvedType rtChildReturnType  = child.resolve(world).getGenericReturnType().resolve(world);
                  incompatibleReturnTypes = !rtParentReturnType.isAssignableFrom(rtChildReturnType);
                  if (incompatibleReturnTypes) {
                          incompatibleReturnTypes = !rtParentReturnType.isAssignableFrom(rtChildReturnType);