summaryrefslogtreecommitdiffstats
path: root/weaver
diff options
context:
space:
mode:
authoraclement <aclement>2006-04-25 07:29:29 +0000
committeraclement <aclement>2006-04-25 07:29:29 +0000
commitc4d2a21b1609ca7473dedce2d855815146cb017f (patch)
treec5e4fc65e247f4b1576e1998a2f48c34f0ada93e /weaver
parent6b2526fdda56e30d8a151ca0b9bd16ecb690d3d0 (diff)
downloadaspectj-c4d2a21b1609ca7473dedce2d855815146cb017f.tar.gz
aspectj-c4d2a21b1609ca7473dedce2d855815146cb017f.zip
test and another part of the fix for 137496
Diffstat (limited to 'weaver')
-rw-r--r--weaver/src/org/aspectj/weaver/bcel/BcelShadow.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
index 21cfb1b27..b201b039c 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
@@ -3179,7 +3179,11 @@ public class BcelShadow extends Shadow {
if (getKind() == PreInitialization) {
returnType = UnresolvedType.OBJECTARRAY;
} else {
- returnType = getReturnType();
+
+ if (getKind() == ConstructorCall) returnType = getSignature().getDeclaringType();
+ else if (getKind() == FieldSet) returnType = ResolvedType.VOID;
+ else returnType = getSignature().getReturnType().resolve(world);
+// returnType = getReturnType(); // for this and above lines, see pr137496
}
return
new LazyMethodGen(