summaryrefslogtreecommitdiffstats
path: root/weaver
diff options
context:
space:
mode:
authorAndy Clement <andrew.clement@gmail.com>2013-01-25 16:54:33 -0800
committerAndy Clement <andrew.clement@gmail.com>2013-01-25 16:54:33 -0800
commitf1a8813c3b200f7564f5247b4f02143fde35f0c6 (patch)
tree8392252b86c788c05eb027308ad3e555c688b1c0 /weaver
parent8dc8d1e0b897d9ab515ed3d99abaee930b45c9d5 (diff)
downloadaspectj-f1a8813c3b200f7564f5247b4f02143fde35f0c6.tar.gz
aspectj-f1a8813c3b200f7564f5247b4f02143fde35f0c6.zip
390269: fix for gc'd raw type refs
Diffstat (limited to 'weaver')
-rw-r--r--weaver/src/org/aspectj/weaver/bcel/BcelWorld.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelWorld.java b/weaver/src/org/aspectj/weaver/bcel/BcelWorld.java
index 7bf873bb1..9fce00cd4 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelWorld.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelWorld.java
@@ -461,14 +461,14 @@ public class BcelWorld extends World implements Repository {
if (nameTypeX == null) {
if (jc.isGeneric() && isInJava5Mode()) {
- nameTypeX = ReferenceType.fromTypeX(UnresolvedType.forRawTypeName(jc.getClassName()), this);
- ret = buildBcelDelegate(nameTypeX, jc, artificial, true);
+ ReferenceType rawType = ReferenceType.fromTypeX(UnresolvedType.forRawTypeName(jc.getClassName()), this);
+ ret = buildBcelDelegate(rawType, jc, artificial, true);
ReferenceType genericRefType = new ReferenceType(UnresolvedType.forGenericTypeSignature(signature,
ret.getDeclaredGenericSignature()), this);
- nameTypeX.setDelegate(ret);
+ rawType.setDelegate(ret);
genericRefType.setDelegate(ret);
- nameTypeX.setGenericType(genericRefType);
- typeMap.put(signature, nameTypeX);
+ rawType.setGenericType(genericRefType);
+ typeMap.put(signature, rawType);
} else {
nameTypeX = new ReferenceType(signature, this);
ret = buildBcelDelegate(nameTypeX, jc, artificial, true);