Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Task/Future bugs #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rubber-duck wants to merge 5 commits into from
Closed

Task/Future bugs #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c57e1f5
If the function is null Wait will not get called and will not check i…
rubber-duck Mar 18, 2011
e74f4eb
Must pass null to overloaded constructor instead of wrapper lambda (T…
rubber-duck Mar 18, 2011
2572021
Continuation options should be checked as flags ?
rubber-duck Mar 18, 2011
cbd5bc9
Fixed formatting error
rubber-duck Mar 18, 2011
ffa72c9
Fixed formatting error
rubber-duck Mar 18, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions mcs/class/corlib/System.Threading.Tasks/Future.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,11 @@ public class Task<TResult>: Task
[System.Diagnostics.DebuggerBrowsable (System.Diagnostics.DebuggerBrowsableState.Never)]
public TResult Result {
get {
if (function != null)
if (function != null) {
Wait ();
} else if (Exception != null) {
throw Exception;
}
return value;
}
internal set {
Expand All @@ -61,19 +64,19 @@ public Task (Func<TResult> function) : this (function, TaskCreationOptions.None)
}

public Task (Func<TResult> function, CancellationToken cancellationToken)
: this ((o) => function (), null, cancellationToken, TaskCreationOptions.None)
: this (function == null ? (Func<object, TResult>)null : (o) => function(), null, cancellationToken, TaskCreationOptions.None)
{

}

public Task (Func<TResult> function, TaskCreationOptions creationOptions)
: this ((o) => function (), null, CancellationToken.None, creationOptions)
: this (function == null ? (Func<object, TResult>)null : (o) => function(), null, CancellationToken.None, creationOptions)
{

}

public Task (Func<TResult> function, CancellationToken cancellationToken, TaskCreationOptions creationOptions)
: this ((o) => function (), null, cancellationToken, creationOptions)
: this (function == null ? (Func<object, TResult>)null : (o) => function(), null, cancellationToken, creationOptions)
{

}
Expand Down
18 changes: 9 additions & 9 deletions mcs/class/corlib/System.Threading.Tasks/Task.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,25 +302,25 @@ bool ContinuationStatusCheck (TaskContinuationOptions kind)

if (kindCode >= ((int)TaskContinuationOptions.NotOnRanToCompletion)) {
if (status == TaskStatus.Canceled) {
if (kind == TaskContinuationOptions.NotOnCanceled)
if ((kind & TaskContinuationOptions.NotOnCanceled) > 0)
return false;
if (kind == TaskContinuationOptions.OnlyOnFaulted)
if ((kind & TaskContinuationOptions.OnlyOnFaulted) > 0)
return false;
if (kind == TaskContinuationOptions.OnlyOnRanToCompletion)
if ((kind & TaskContinuationOptions.OnlyOnRanToCompletion) > 0)
return false;
} else if (status == TaskStatus.Faulted) {
if (kind == TaskContinuationOptions.NotOnFaulted)
if ((kind & TaskContinuationOptions.NotOnFaulted) > 0)
return false;
if (kind == TaskContinuationOptions.OnlyOnCanceled)
if ((kind & TaskContinuationOptions.OnlyOnCanceled) > 0)
return false;
if (kind == TaskContinuationOptions.OnlyOnRanToCompletion)
if ((kind & TaskContinuationOptions.OnlyOnRanToCompletion) > 0)
return false;
} else if (status == TaskStatus.RanToCompletion) {
if (kind == TaskContinuationOptions.NotOnRanToCompletion)
if ((kind & TaskContinuationOptions.NotOnRanToCompletion) > 0)
return false;
if (kind == TaskContinuationOptions.OnlyOnFaulted)
if ((kind & TaskContinuationOptions.OnlyOnFaulted) > 0)
return false;
if (kind == TaskContinuationOptions.OnlyOnCanceled)
if ((kind & TaskContinuationOptions.OnlyOnCanceled) > 0)
return false;
}
}
Expand Down