Imported Upstream version 3.12.0

Former-commit-id: cf92446697332992ec36726e78eb8703e1f259d7
This commit is contained in:
Jo Shields
2015-01-13 10:44:36 +00:00
parent 8b9b85e7f5
commit 181b81b4a4
659 changed files with 12743 additions and 16300 deletions

View File

@@ -635,7 +635,7 @@ namespace System.Threading.Tasks
#region Cancel and Wait related method
internal void CancelReal ()
internal void CancelReal (bool notifyParent = false)
{
Status = TaskStatus.Canceled;
@@ -643,6 +643,9 @@ namespace System.Threading.Tasks
wait_handle.Set ();
ProcessCompleteDelegates ();
if (notifyParent && parent != null && NotifyParentOnFinish ())
parent = null;
}
void HandleGenericException (Exception e)

View File

@@ -94,7 +94,7 @@ namespace System.Threading.Tasks
public void Execute ()
{
if (!ContinuationStatusCheck (continuationOptions)) {
task.CancelReal ();
task.CancelReal (notifyParent : true);
task.Dispose ();
return;
}