diff options
| author | acolyer <acolyer> | 2005-08-31 14:11:45 +0000 |
|---|---|---|
| committer | acolyer <acolyer> | 2005-08-31 14:11:45 +0000 |
| commit | a0ab747e10653a76abf8ddf839fa6b830e65acb1 (patch) | |
| tree | ea0f5d0497f6857b54aaa630a8bf9a74896562db /weaver | |
| parent | b953c0347a539890d9e1f87feabc78a3d687c50f (diff) | |
| download | aspectj-a0ab747e10653a76abf8ddf839fa6b830e65acb1.tar.gz aspectj-a0ab747e10653a76abf8ddf839fa6b830e65acb1.zip | |
tests and fix for pr105479, declare parents introducing method override with covariance
Diffstat (limited to 'weaver')
| -rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java index 47d0b82ab..b3b05c2b1 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java @@ -308,7 +308,7 @@ public class BcelTypeMunger extends ConcreteTypeMunger { // Allow for covariance - wish I could test this (need Java5...) ResolvedType subType = weaver.getWorld().resolve(subMethod.getReturnType()); ResolvedType superType = weaver.getWorld().resolve(superMethod.getReturnType()); - if (!subType.isAssignableFrom(superType)) { + if (!superType.isAssignableFrom(subType)) { ISourceLocation sloc = subMethod.getSourceLocation(); weaver.getWorld().getMessageHandler().handleMessage(MessageUtil.error( "The return type is incompatible with "+superMethod.getDeclaringType()+"."+superMethod.getName()+superMethod.getParameterSignature(), |