230134: tests and fixes - move cflow caches from static state to crosscuttingmembers...

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java
index c3a5fddbf221718263b82668a681f741a237adc0..d58fbcf6ffd5a4e1274fc709d7f779b44bd7ff43 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java
@@ -321,7 +321,6 @@ public class AjCompilerAdapter extends AbstractCompilerAdapter {
                  weaver.weave(new WeaverAdapter(this,weaverMessageHandler,progressListener));
                } finally {
                        // ???: is this the right point for this? After weaving has finished clear the caches.
-                       CflowPointcut.clearCaches();
                        if (weaverMessageHandler instanceof WeaverMessageHandler)
                                  ((WeaverMessageHandler)weaverMessageHandler).setCurrentResult(null);
                        weaver.allWeavingComplete();

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java
index f6f33835d0615624401176af37aed1975ef37968..85fc2b4fff1195ce1ed9e55cd58c0482c81e3144 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java
@@ -504,7 +504,6 @@ public class AjPipeliningCompilerAdapter extends AbstractCompilerAdapter {
                try {
                  weaver.weave(new WeaverAdapter(this,weaverMessageHandler,progressListener));
                } finally {
-                       CflowPointcut.clearCaches();
                        weaver.tidyUp();
                        IMessageHandler imh = weaver.getWorld().getMessageHandler();
                        if (imh instanceof WeaverMessageHandler)
@@ -516,7 +515,6 @@ public class AjPipeliningCompilerAdapter extends AbstractCompilerAdapter {
        private void postWeave() {
                if (debugPipeline)System.err.println("> postWeave()");
                IMessageHandler imh = weaver.getWorld().getMessageHandler();
-               CflowPointcut.clearCaches();
                if (imh instanceof WeaverMessageHandler)
                          ((WeaverMessageHandler)imh).setCurrentResult(null);
                if (!droppingBackToFullBuild) weaver.allWeavingComplete();