aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2005-11-21 15:57:19 +0000
committeraclement <aclement>2005-11-21 15:57:19 +0000
commit206ab1288754f4c324262667b936b2b0cc865caa (patch)
treed97d86dd304b81137c3803f910a85fe268335302
parent611a7dad9c073d9f85f2ccf361477129bdd81185 (diff)
downloadaspectj-206ab1288754f4c324262667b936b2b0cc865caa.tar.gz
aspectj-206ab1288754f4c324262667b936b2b0cc865caa.zip
pr115250: doesnt attempt to create invoke calls on parameterized types!
-rw-r--r--weaver/src/org/aspectj/weaver/bcel/Utility.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/weaver/src/org/aspectj/weaver/bcel/Utility.java b/weaver/src/org/aspectj/weaver/bcel/Utility.java
index 3e6af17a9..ef7324a8e 100644
--- a/weaver/src/org/aspectj/weaver/bcel/Utility.java
+++ b/weaver/src/org/aspectj/weaver/bcel/Utility.java
@@ -125,8 +125,12 @@ public class Utility {
kind = Constants.INVOKEVIRTUAL;
}
+ UnresolvedType targetType = signature.getDeclaringType();
+ if (targetType.isParameterizedType()) {
+ targetType = targetType.resolve(world).getGenericType();
+ }
return fact.createInvoke(
- signature.getDeclaringType().getName(),
+ targetType.getName(),
signature.getName(),
BcelWorld.makeBcelType(signature.getReturnType()),
BcelWorld.makeBcelTypes(signature.getParameterTypes()),