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

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 ed049bef3..97c2f1678 100644
--- 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);