diff options
| author | aclement <aclement> | 2009-01-29 21:03:29 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2009-01-29 21:03:29 +0000 |
| commit | 0614ca9b7b46864f3319b3d71984319c173d0dfe (patch) | |
| tree | 201488136e387665c301bf4707d86a7359522d3b /ajde.core | |
| parent | a066840ea5b8a2a99209147b001181b04445c7b1 (diff) | |
| download | aspectj-0614ca9b7b46864f3319b3d71984319c173d0dfe.tar.gz aspectj-0614ca9b7b46864f3319b3d71984319c173d0dfe.zip | |
262288: cope with a previous build that did not fill in the buildconfig
Diffstat (limited to 'ajde.core')
| -rw-r--r-- | ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java | 9 |
1 files changed, 1 insertions, 8 deletions
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) { |