wrong handler reference

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 0b3d3717159c62606201619786ac800f210560b6..336f02da8c8a2b6c9478e0a6aac5577871a16558 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
@@ -99,7 +99,7 @@ public class AjBuildManager {
                
             boolean canIncremental = state.prepareForNextBuild(buildConfig);
             if (!canIncremental && !batch) { // retry as batch?
-                return doBuild(buildConfig, handler, true);
+                return doBuild(buildConfig, baseHandler, true);
             }
             this.handler = 
                 CountingMessageHandler.makeCountingMessageHandler(baseHandler);
@@ -125,7 +125,7 @@ public class AjBuildManager {
             }
             
             if (batch) {
-                //System.err.println("XXXX batch: " + buildConfig.getFiles());
+                // System.err.println("XXXX batch: " + buildConfig.getFiles());
                 if (buildConfig.isEmacsSymMode() || buildConfig.isGenerateModelMode()) {  
                     bcelWorld.setModel(StructureModelManager.INSTANCE.getStructureModel());
                     // in incremental build, only get updated model?
@@ -139,10 +139,10 @@ public class AjBuildManager {
 //                if (buildConfig.isEmacsSymMode() || buildConfig.isGenerateModelMode()) {  
 //                    bcelWorld.setModel(StructureModelManager.INSTANCE.getStructureModel());
 //                }
-                //System.err.println("XXXX start inc ");
+                // System.err.println("XXXX start inc ");
                 List files = state.getFilesToCompile(true);
                 for (int i = 0; (i < 5) && !files.isEmpty(); i++) {
-                    //System.err.println("XXXX inc: " + files);
+                    // System.err.println("XXXX inc: " + files);
                     performCompilation(files);
                     if (handler.hasErrors()) {
                         return false;