From bc0c559654cb471c8392ded0f25d12b527e1f115 Mon Sep 17 00:00:00 2001 From: jhugunin Date: Thu, 19 Dec 2002 23:13:44 +0000 Subject: [PATCH] excluding new preinitialization join points --- tests/new/AroundAll.java | 2 +- tests/new/CflowAlone.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/new/AroundAll.java b/tests/new/AroundAll.java index 48d1263c8..0200c5e0a 100644 --- a/tests/new/AroundAll.java +++ b/tests/new/AroundAll.java @@ -154,7 +154,7 @@ aspect A { } Object around(): //initialization(C.new(String)) { - if(test()) && !within(A) && !call(* A.*(..)) { + if(test()) && !within(A) && !call(* A.*(..)) && !preinitialization(new(..)) { A.log("enter " + thisJoinPoint); Object ret = proceed(); A.log("exit " + thisJoinPoint); diff --git a/tests/new/CflowAlone.java b/tests/new/CflowAlone.java index 19cdc035d..abd2e42f7 100644 --- a/tests/new/CflowAlone.java +++ b/tests/new/CflowAlone.java @@ -20,7 +20,7 @@ aspect Filteraspect { //pointcut goCut(): cflow(!within(FilterAspect)); //pointcut goCut(): cflow(within(FilterAspect)); //pointcut goCut(): cflow(within(testclass1)); - pointcut goCut(): !within(Filteraspect) && cflow(within(testclass1)); + pointcut goCut(): !within(Filteraspect) && cflow(within(testclass1)) && !preinitialization(new(..)); // works ok //pointcut goCut(): within(Filteraspect); Object around(): goCut() { i++; return proceed(); } -- 2.39.5