From be063b851651ebcfe1e147198842e28ea7dbbb26 Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Mon, 9 Apr 2012 14:15:55 -0700 Subject: 376351 --- weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'weaver') diff --git a/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java b/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java index 87b0f6b95..07477d1a9 100644 --- a/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java +++ b/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java @@ -30,7 +30,7 @@ public class StackMapAdder { public static byte[] addStackMaps(World world, byte[] data) { try { ClassReader cr = new ClassReader(data); - ClassWriter cw = new AspectJConnectClassWriter(world); + ClassWriter cw = new AspectJConnectClassWriter(cr, world); cr.accept(cw, 0); return cw.toByteArray(); } catch (Throwable t) { @@ -43,8 +43,8 @@ public class StackMapAdder { private static class AspectJConnectClassWriter extends ClassWriter { private final World world; - public AspectJConnectClassWriter(World w) { - super(ClassWriter.COMPUTE_FRAMES); + public AspectJConnectClassWriter(ClassReader cr, World w) { + super(cr, ClassWriter.COMPUTE_FRAMES); // passing in cr is necessary so cpool isnt modified (see 2.2.4 of asm doc) this.world = w; } -- cgit v1.2.3