From 5a72ea787bcc11690a47a78b333709e0b9b111bb Mon Sep 17 00:00:00 2001 From: rfeng Date: Wed, 6 Aug 2008 06:19:25 +0000 Subject: Update to aspectj 1.6.1 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@683127 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/tuscany/sca/aspectj/TracingAspect.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'sandbox/rfeng/aop-logging/src/main/java') diff --git a/sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java b/sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java index 91489bae7d..7a6e4c5ded 100644 --- a/sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java +++ b/sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java @@ -35,15 +35,19 @@ public abstract class TracingAspect { @Pointcut("") protected abstract void entry(); - @Pointcut("call(* java..*.*(..))") + /** ignore join points outside this scope - use within(..) */ + @Pointcut("") + protected abstract void withinScope(); + + @Pointcut("withinScope() && call(* java..*.*(..))") protected void exit() { } - @Pointcut("entry() && !cflowbelow(entry())") + @Pointcut("withinScope() && entry() && !cflowbelow(entry())") void start() { } - @Pointcut("cflow(entry()) && !exit() && !cflowbelow(exit()) && !within(org.apache.tuscany.sca.aspectj.*Aspect)") + @Pointcut("withinScope() && cflow(entry()) && !cflowbelow(exit()) && !within(org.apache.tuscany.sca.aspectj.*Aspect)") void trace() { } -- cgit v1.2.3