diff options
| author | Andrey Loskutov | 2021-06-15 07:07:29 +0000 |
|---|---|---|
| committer | Andrey Loskutov | 2021-06-15 09:12:29 +0000 |
| commit | 05edcbadc30e1483b2aa0f1af366493f21dd9c31 (patch) | |
| tree | e7eb572af90f263b1b1ee76412883b476f33b2b0 | |
| parent | 6f51e1b87d52320dceed8ee115898b8d43e91f1a (diff) | |
| download | eclipse.platform.resources-05edcbadc30e1483b2aa0f1af366493f21dd9c31.tar.gz eclipse.platform.resources-05edcbadc30e1483b2aa0f1af366493f21dd9c31.tar.xz eclipse.platform.resources-05edcbadc30e1483b2aa0f1af366493f21dd9c31.zip | |
Bug 568299 - don't exit early build loop in "autobuild off" caseY20210615-0910Y20210615-0900
The "early exit" change is required only for autobuild case, where we
cancel the build because we know a rebuild is requested and next round
will be there. With autobuild off there is no next round, so that would
be a regression to exit early, therefore don't exit the build loop.
Change-Id: I4c059b4cbae3109a1b796cce18883c09d78748f7
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.resources/+/181960
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>
| -rw-r--r-- | bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/BuildManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/BuildManager.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/BuildManager.java index c2f06282d..d4bc31a9f 100644 --- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/BuildManager.java +++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/BuildManager.java @@ -268,7 +268,8 @@ public class BuildManager implements ICoreConstants, IManager, ILifecycleListene try { for (int i = 0; i < commands.length; i++) { checkCanceled(trigger, monitor); - if (EARLY_EXIT_FROM_INNER_BUILD_LOOP_ALLOWED && rebuildRequested && !parallelBuild) { + if (EARLY_EXIT_FROM_INNER_BUILD_LOOP_ALLOWED && rebuildRequested && !parallelBuild + && workspace.isAutoBuilding()) { // Don't build following configs if one of the predecessors // requested rebuild anyway, just start from scratch break; |