commit befdb47f16839b1917476c8914b5a0f713c9a515
author Stefan Xenos <sxenos@gmail.com> Wed Nov 02 11:32:31 2016 -0400
committer Stefan Xenos <sxenos@gmail.com> Wed Nov 02 11:32:44 2016 -0400
tree e19eecc95002d69bd8f4ee2c5b096edf35a7c925
parent 40949ee1ea02c54fc125702ba66d8504abbcce2a

Bug 506845 - Workbench blocked after cancelling build job

Don't check for cancellation prior to invoking endOperation
(since endOperation needs to be called as part of canceling an
operation).

Change-Id: I5f97caf98f155f079e5108f00c74134672d2fac8
Signed-off-by: Stefan Xenos <sxenos@gmail.com>

bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/AutoBuildJob.java

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 a8b8e61..27baed5 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
@@ -154,7 +154,7 @@
 			if (workspace.getElementTree().isImmutable()) {
 				workspace.newWorkingTree();
 			}
-			workspace.endOperation(rule, false, subMonitor.split(Policy.endOpWork));
+			workspace.endOperation(rule, false, subMonitor.newChild(Policy.endOpWork, SubMonitor.SUPPRESS_ISCANCELED | SubMonitor.SUPPRESS_BEGINTASK));
 		}
 	}