aboutsummaryrefslogtreecommitdiffstats
path: root/weaver
diff options
context:
space:
mode:
authoraclement <aclement>2008-08-19 20:44:32 +0000
committeraclement <aclement>2008-08-19 20:44:32 +0000
commitbff0937e36541ac18f3dbe299b9bd3f65bc2fb04 (patch)
tree0c76c50bae118c5e601cb84368fa48954dcab259 /weaver
parent61cfbc4afb972b2d4a4f9f0d982d94d54c447a40 (diff)
downloadaspectj-bff0937e36541ac18f3dbe299b9bd3f65bc2fb04.tar.gz
aspectj-bff0937e36541ac18f3dbe299b9bd3f65bc2fb04.zip
removed dup code!
Diffstat (limited to 'weaver')
-rw-r--r--weaver/src/org/aspectj/weaver/ResolvedType.java7
1 files changed, 4 insertions, 3 deletions
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());
}