diff options
author | aclement <aclement> | 2005-11-07 10:54:21 +0000 |
---|---|---|
committer | aclement <aclement> | 2005-11-07 10:54:21 +0000 |
commit | f00d694940fbb8999b63b90d357c8d8409151670 (patch) | |
tree | 2cf5ced4059bdec6d4707e6c43e8803d37f51a35 /weaver | |
parent | a625ea2ed4810fb5aa1334c027418d25cfb37834 (diff) | |
download | aspectj-f00d694940fbb8999b63b90d357c8d8409151670.tar.gz aspectj-f00d694940fbb8999b63b90d357c8d8409151670.zip |
canBeBoundTo fix for isAssignable.
Diffstat (limited to 'weaver')
-rw-r--r-- | weaver/src/org/aspectj/weaver/ReferenceType.java | 3 |
1 files changed, 2 insertions, 1 deletions
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)); } } |