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

[246789] - [concurrent] Sequence.cancel() can trigger an assertion error in RequestMonitor

Browse source
This commit is contained in:
Pawel Piech 2008-09-09 20:59:09 +00:00
parent 56adb58e42
commit cfe2a71e89
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/Sequence.java
View file

@ -23,6 +23,7 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
import org.eclipse.dd.dsf.concurrent.RequestMonitor.ICanceledListener;
import org.eclipse.dd.dsf.internal.DsfPlugin;
/**
@ -153,6 +154,12 @@ abstract public class Sequence extends DsfRunnable implements Future<Object> {
fTaskName = taskName;
fRollbackTaskName = rollbackTaskName;
fRequestMonitor = rm;
fRequestMonitor.addCancelListener(new ICanceledListener() {
public void requestCanceled(RequestMonitor rm) {
fSync.doCancel();
}
});
}
/**
@ -198,9 +205,20 @@ abstract public class Sequence extends DsfRunnable implements Future<Object> {
/**
* Don't try to interrupt the DSF executor thread, just ignore the request
* if set.
* <p>If a request monitor was specified when creating a sequence, that
* request monitor will be canceled by this method as well. The client
* can also use the request monitor's cancel method to cancel the sequence.
*
* @see RequestMonitor#cancel()
*/
public boolean cancel(boolean mayInterruptIfRunning) {
return fSync.doCancel();
// Cancel the request monitor first, to avoid a situation where
// the request monitor is not canceled but the status is set
// to canceled.
if (fRequestMonitor != null) {
fRequestMonitor.cancel();
}
return fSync.doCancel();
}
public boolean isCancelled() { return fSync.doIsCancelled(); }