Browse Source

230134: tests and fixes - move cflow caches from static state to crosscuttingmembers for the aspect, fixing their lifecycle.

tags/Root_refactoring
aclement 16 years ago
parent
commit
0758535a3c

+ 0
- 1
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java View File

@@ -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();

+ 0
- 2
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java View File

@@ -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();

Loading…
Cancel
Save