excluding new preinitialization join points

diff --git a/tests/new/AroundAll.java b/tests/new/AroundAll.java
index 48d1263c89e136243282528d92109befbebd7e5b..0200c5e0a90bf112fb3e45d5080ddaa005359913 100644 (file)
--- 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 19cdc035d23b0bf90e252579e15fc7aafd7d1880..abd2e42f7528665e9474d23732b998c089886835 100644 (file)
--- 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(); }