From d1ca41db5d4944469f7293bd4317b4e590036fb0 Mon Sep 17 00:00:00 2001 From: aclement Date: Wed, 28 Jan 2009 00:32:57 +0000 Subject: [PATCH] refactoring to make around advice lvt fixes easier to apply - and make the code a bit clearer --- weaver/src/org/aspectj/weaver/bcel/BcelShadow.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java index 3233136b0..ddc6ab6df 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java @@ -2142,7 +2142,7 @@ public class BcelShadow extends Shadow { // now generate the aroundBody method // eg. "private static final void method_aroundBody0(M, M, String, org.aspectj.lang.JoinPoint)" - LazyMethodGen extractedShadowMethod = extractShadowInstructionsIntoNewMethod(NameMangler.aroundCallbackMethodName( + LazyMethodGen extractedShadowMethod = extractShadowInstructionsIntoNewMethod(NameMangler.aroundShadowMethodName( getSignature(), new Integer(getEnclosingClass().getNewGeneratedNameTag()).toString()), Modifier.PRIVATE, munger); List argsToCallLocalAdviceMethodWith = new ArrayList(); @@ -2692,7 +2692,7 @@ public class BcelShadow extends Shadow { int linenumber = getSourceLine(); // MOVE OUT ALL THE INSTRUCTIONS IN MY SHADOW INTO ANOTHER METHOD! - LazyMethodGen callbackMethod = extractShadowInstructionsIntoNewMethod(NameMangler.aroundCallbackMethodName(getSignature(), + LazyMethodGen callbackMethod = extractShadowInstructionsIntoNewMethod(NameMangler.aroundShadowMethodName(getSignature(), new Integer(getEnclosingClass().getNewGeneratedNameTag()).toString()), 0, munger); BcelVar[] adviceVars = munger.getExposedStateAsBcelVars(true); -- 2.39.5