make cleanup part of compiler discard

2 files changed, 5 insertions, 10 deletions

diff --git a/ajde.core/src/org/aspectj/ajde/core/AjCompiler.java b/ajde.core/src/org/aspectj/ajde/core/AjCompiler.java
index 758073d83..72eb4058c 100644
--- a/ajde.core/src/org/aspectj/ajde/core/AjCompiler.java
+++ b/ajde.core/src/org/aspectj/ajde/core/AjCompiler.java
@@ -89,13 +89,6 @@ public class AjCompiler {
 	}
 
 	/**
-	 * Cleanup the compiler instance, ready for removal.
-	 */
-	public void cleanup() {
-		buildManager.cleanup();
-	}
-
-	/**
 	 * Perform a full build.
 	 */
 	public void buildFresh() {
@@ -106,10 +99,12 @@ public class AjCompiler {
 
 	/**
 	 * Clear the incremental state associated with this AjCompiler from the IncrementalStateManager. This is necessary until AjState
-	 * is reworked and there's an AjState associated with an AjCompiler rather than requiring a map of them.
+	 * is reworked and there's an AjState associated with an AjCompiler rather than requiring a map of them. If the environment is
+	 * not cleaned up then jar locks may be kept.
 	 */
 	public void clearLastState() {
 		IncrementalStateManager.removeIncrementalStateInformationFor(compilerId);
+		buildManager.cleanupEnvironment();
 	}
 
 	/**
diff --git a/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java b/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
index c22248f46..074222b51 100644
--- a/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
+++ b/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
@@ -391,7 +391,7 @@ public class AjdeCoreBuildManager {
 		return ajBuildManager.getCustomMungerFactory();
 	}
 
-	public void cleanup() {
-		ajBuildManager.cleanup();
+	public void cleanupEnvironment() {
+		ajBuildManager.cleanupEnvironment();
 	}
 }