diff options
author | Andy Clement <aclement@gopivotal.com> | 2014-04-14 15:01:56 -0700 |
---|---|---|
committer | Andy Clement <aclement@gopivotal.com> | 2014-04-14 15:01:56 -0700 |
commit | 5aaca752afa424015f81379dcd0a69e737340e56 (patch) | |
tree | 15d2c5ccd54098757f9074dc822c3a1f55806861 /weaver | |
parent | 331399f82b33cc4cff8239aab18e405dfe0dd2b9 (diff) | |
download | aspectj-5aaca752afa424015f81379dcd0a69e737340e56.tar.gz aspectj-5aaca752afa424015f81379dcd0a69e737340e56.zip |
Fix 432714: stack map frame and genericsV1_8_0RC3
Diffstat (limited to 'weaver')
-rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java b/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java index 7f8c2ad3b..4624dda29 100644 --- a/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java +++ b/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java @@ -97,6 +97,9 @@ public class StackMapAdder { } else { do { resolvedType1 = resolvedType1.getSuperclass(); + if (resolvedType1.isParameterizedOrGenericType()) { + resolvedType1 = resolvedType1.getRawType(); + } } while (!resolvedType1.isAssignableFrom(resolvedType2)); return resolvedType1.getRawName().replace('.', '/'); } |