Bug 579153 - canceling java build may lead to full build
Revert "Bug 578640 - cancel autobuild when user wants to interrupt it"
This reverts commit e6cf8197dad20aab0a714e9b91e6f1b1ff885c81.
Change-Id: Id85118d2ab0f414c1a593e95ce8c9b2c2c0ec1f9
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.resources/+/190425
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Andrey Loskutov <loskutov@gmx.de>
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/AutoBuildJob.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/AutoBuildJob.java
index d3f6b89..4cc5e66 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/AutoBuildJob.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/AutoBuildJob.java
@@ -269,11 +269,12 @@
*/
private synchronized void setInterrupted(boolean value) {
interrupted = value;
+ // we do not "cancel" in case of interrupt but let the builder decide because
+ // for example JDT builder can not resume from canceled autobuild but requires full build
+ // cancel = explicit user request
+ // interrupt = automatic conflict solving
if (interrupted && Policy.DEBUG_BUILD_INTERRUPT)
Policy.debug(new RuntimeException("Autobuild was interrupted")); //$NON-NLS-1$
- if (interrupted) {
- cancel(); // interrupt alone does not stop for example the java builder.
- }
}
/**
