From f00d694940fbb8999b63b90d357c8d8409151670 Mon Sep 17 00:00:00 2001 From: aclement Date: Mon, 7 Nov 2005 10:54:21 +0000 Subject: [PATCH] canBeBoundTo fix for isAssignable. --- weaver/src/org/aspectj/weaver/ReferenceType.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/weaver/src/org/aspectj/weaver/ReferenceType.java b/weaver/src/org/aspectj/weaver/ReferenceType.java index 0bc7a0d94..22a21a12c 100644 --- a/weaver/src/org/aspectj/weaver/ReferenceType.java +++ b/weaver/src/org/aspectj/weaver/ReferenceType.java @@ -294,7 +294,7 @@ public class ReferenceType extends ResolvedType { if (isTypeVariableReference() && !other.isTypeVariableReference()) { // eg. this=T other=Ljava/lang/Object; TypeVariable aVar = ((TypeVariableReference)this).getTypeVariable(); - return aVar.getFirstBound().resolve(world).isAssignableFrom(other); + return aVar.resolve(world).canBeBoundTo(other); } if (other.isTypeVariableReference()) { @@ -302,6 +302,7 @@ public class ReferenceType extends ResolvedType { if (this instanceof TypeVariableReference) { return ((TypeVariableReference)this).getTypeVariable()==otherType.getTypeVariable(); } else { + // FIXME asc should this say canBeBoundTo?? return this.isAssignableFrom(otherType.getTypeVariable().getFirstBound().resolve(world)); } } -- 2.39.5