From: aclement <aclement>
Date: Mon, 5 May 2008 18:55:45 +0000 (+0000)
Subject: 230134: tests and fixes - move cflow caches from static state to crosscuttingmembers... 
X-Git-Tag: Root_refactoring~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0758535a3ce9869e81bd6ff3d1750bbae8d98df2;p=aspectj.git

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

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 c3a5fddbf..d58fbcf6f 100644
--- 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 f6f33835d..85fc2b4ff 100644
--- 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();