undo some of the deoptimization

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 0799a7784a68c479b1609f02546c034d440ab23c..177e952599616a9790c2c648d307bc172af93067 100644 (file)
--- 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
@@ -953,7 +953,6 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour
                        }
                        environment = new StatefulNameEnvironment(getLibraryAccess(classpaths, filenames), state.getClassNameToFileMap(), state);
                        state.setNameEnvironment(environment);
-
                }
 
                org.aspectj.ajdt.internal.compiler.CompilerAdapter.setCompilerAdapterFactory(this);
@@ -971,15 +970,11 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour
                // cleanup
                org.aspectj.ajdt.internal.compiler.CompilerAdapter.setCompilerAdapterFactory(null);
                AnonymousClassPublisher.aspectOf().setAnonymousClassCreationListener(null);
-               if (!willReceiveAJDTCallbackForCleanup) {
-                       environment.cleanup();
-                       environment = null;
-               }
+               environment.cleanup();
+               // environment = null;
        }
 
-       public static boolean willReceiveAJDTCallbackForCleanup = false;
-
-       public void cleanup() {
+       public void cleanupEnvironment() {
                environment.cleanup();
                environment = null;
        }