Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Schaefer2018-03-06 15:22:18 +0000
committerDoug Schaefer2018-03-06 15:48:38 +0000
commitc781ba5c361d9b9b5b4f43b920a111c46e3b928c (patch)
tree253dbfc413c527202c57f01170f8376010b5aeec /core/org.eclipse.cdt.core/model/org
parent8934f52ae631c7f7bb2681d67361f6b5cfbcc1c1 (diff)
downloadorg.eclipse.cdt-c781ba5c361d9b9b5b4f43b920a111c46e3b928c.tar.gz
org.eclipse.cdt-c781ba5c361d9b9b5b4f43b920a111c46e3b928c.tar.xz
org.eclipse.cdt-c781ba5c361d9b9b5b4f43b920a111c46e3b928c.zip
Remove wait on stop in BinaryRunner. It causes deadlock.
If we have issues with the runner while the job is trying to cancel, we sould be address it there. Change-Id: I2c42d654f4d08a7499c97c52fe14d76e24aa3dd6
Diffstat (limited to 'core/org.eclipse.cdt.core/model/org')
-rw-r--r--core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryRunner.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryRunner.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryRunner.java
index 7fff3e71f68..48aa6cab590 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryRunner.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryRunner.java
@@ -163,14 +163,13 @@ public class BinaryRunner {
}
/**
- * Cancels the binary runner and waits until it is stopped.
+ * Cancels the binary runner
*/
public void stop() {
synchronized (runnerJob) {
isStopped= true; // make sure job is not scheduled afterwards
runnerJob.cancel();
}
- waitIfRunning();
}
private class Visitor implements IResourceProxyVisitor {

Back to the top