From 5731eaec26015751b6f4195878e7d62ae8118094 Mon Sep 17 00:00:00 2001
From: jhugunin <jhugunin>
Date: Wed, 22 Jan 2003 00:50:14 +0000
Subject: [PATCH] fix for Bugzilla Bug 29684    Incremental: Commenting out
 conflict yeilds NullPointerException

---
 .../org/aspectj/ajdt/internal/core/builder/AjBuildManager.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 07d8b5714..d5937c487 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
@@ -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);
         }
         
-- 
2.39.5