From: aclement <aclement>
Date: Tue, 19 Aug 2008 20:44:32 +0000 (+0000)
Subject: removed dup code!
X-Git-Tag: V162DEV_M1~125
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bff0937e36541ac18f3dbe299b9bd3f65bc2fb04;p=aspectj.git

removed dup code!
---

diff --git a/weaver/src/org/aspectj/weaver/ResolvedType.java b/weaver/src/org/aspectj/weaver/ResolvedType.java
index 97c2f1678..a1ce07fa7 100644
--- a/weaver/src/org/aspectj/weaver/ResolvedType.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedType.java
@@ -1651,9 +1651,10 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl
 	      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);
-		  }
+		  // For debug, uncomment this bit and we'll repeat the check - stick a breakpoint on the call
+//		  if (incompatibleReturnTypes) {
+//			  incompatibleReturnTypes = !rtParentReturnType.isAssignableFrom(rtChildReturnType);
+//		  }
 		} else {
 		  incompatibleReturnTypes =!parent.getReturnType().equals(child.getReturnType());
 		}