mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Bug 503036 - Fix deadlock caused by previous fix.

Browse source 
Change-Id: Ic333a7f0230e6a28033fd6659408895b34f5b70e
This commit is contained in:
Doug Schaefer 2016-10-14 11:28:27 -04:00 • committed by Gerrit Code Review @ Eclipse.org
parent 4d0a556446
commit e76ec05aab
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryRunner.java
View file

@ -86,7 +86,6 @@ public class BinaryRunner {
private final Job runnerJob; // final fields don't need synchronization private final Job runnerJob; // final fields don't need synchronization
private IOutputEntry[] entries = new IOutputEntry[0]; private IOutputEntry[] entries = new IOutputEntry[0];
private boolean isStopped= false; // access to isStopped must be synchronized. private boolean isStopped= false; // access to isStopped must be synchronized.
private final static Object BINARY_RUNNER_FAMILY = new Object();
public BinaryRunner(IProject prj) { public BinaryRunner(IProject prj) {
cproject = CModelManager.getDefault().create(prj); cproject = CModelManager.getDefault().create(prj);
@ -136,11 +135,6 @@ public class BinaryRunner {
} }
return status; return status;
} }
@Override
public boolean belongsTo(Object family) {
return family == BINARY_RUNNER_FAMILY;
}
}; };
job.setPriority(Job.LONG); job.setPriority(Job.LONG);
return job; return job;
@ -159,7 +153,9 @@ public class BinaryRunner {
*/ */
public void waitIfRunning() { public void waitIfRunning() {
try { try {
Job.getJobManager().join(BINARY_RUNNER_FAMILY, null); if (runnerJob != null && !runnerJob.equals(Job.getJobManager().currentJob())) {
runnerJob.join();
}
} catch (InterruptedException e) { } catch (InterruptedException e) {
} }
} }