fix for Bugzilla Bug 29684

   Incremental: Commenting out conflict yeilds NullPointerException

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 07d8b5714a5e907891e15410dfed9adee028dfa5..d5937c4873a8f23ed86bf7f5ee224caa1b3ef1f2 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
@@ -148,7 +148,7 @@ public class AjBuildManager {
        }
 
        public boolean incrementalBuild(AjBuildConfig buildConfig, IMessageHandler messageHandler) throws CoreException, IOException {
-        if (javaBuilder == null || javaBuilder.currentProject == null) {
+        if (javaBuilder == null || javaBuilder.currentProject == null || javaBuilder.lastState == null) {
                return batchBuild(buildConfig, messageHandler);
         }