From 277941b7a9536b0c210d468177e62306f6d4f3a7 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Thu, 7 Aug 2008 18:19:13 +0000
Subject: [PATCH] 242797: resolve earlier so that any generic method type vars
 are recognized.

---
 weaver/src/org/aspectj/weaver/ResolvedType.java | 4 ++--
 1 file 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);
-- 
2.39.5