From: aclement <aclement>
Date: Thu, 29 Jan 2009 21:03:29 +0000 (+0000)
Subject: 262288: cope with a previous build that did not fill in the buildconfig
X-Git-Tag: pre268419~168
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0614ca9b7b46864f3319b3d71984319c173d0dfe;p=aspectj.git

262288: cope with a previous build that did not fill in the buildconfig
---

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 db4fe814d..d5c95997a 100644
--- a/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
+++ b/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
@@ -77,7 +77,7 @@ public class AjdeCoreBuildManager {
 		// If an incremental build is requested, check that we can
 		if (!fullBuild) {
 			AjState existingState = IncrementalStateManager.retrieveStateFor(compiler.getId());
-			if (existingState == null) {
+			if (existingState == null || existingState.getBuildConfig() == null) {
 				// No existing state so we must do a full build
 				fullBuild = true;
 			} else {
@@ -125,13 +125,6 @@ public class AjdeCoreBuildManager {
 				}
 				ajBuildManager.incrementalBuild(buildConfig, msgHandlerAdapter);
 			}
-			/*
-			 * if (buildFresh) { AjBuildConfig buildConfig = genAjBuildConfig(); if (buildConfig == null) return;
-			 * ajBuildManager.batchBuild(buildConfig,msgHandlerAdapter); } else { AjBuildConfig buildConfig =
-			 * ajBuildManager.getState().getBuildConfig();
-			 * 
-			 * ajBuildManager.incrementalBuild(buildConfig,msgHandlerAdapter); }
-			 */
 			IncrementalStateManager.recordSuccessfulBuild(compiler.getId(), ajBuildManager.getState());
 
 		} catch (ConfigParser.ParseException pe) {