bug 128650: comment 16: tidy up logic

2 files changed, 6 insertions, 0 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index f46dbd4d4..9d6d726ec 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -338,6 +338,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider,IBinarySourc
         	}
             ret = !handler.hasErrors();
             if (getBcelWorld()!=null) getBcelWorld().tidyUp();
+            getWeaver().tidyUp();
             // bug 59895, don't release reference to handler as may be needed by a nested call
             //handler = null;
         }
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java
index 679d0c6bf..e437b5e03 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java
@@ -1195,4 +1195,9 @@ public class AjState {
 		int modifiers;
 		char[] signature;
 	}
+	
+	public void wipeAllKnowledge() {
+		buildManager.state = null;
+		buildManager.setStructureModel(null);
+	}
 }