Bug 568299 - don't exit early build loop in "autobuild off" case
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>
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 c2f0628..d4bc31a 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 @@
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;
