huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'justinvp/taskutilities' into dev

This commit is contained in:
Cesar Blum Silveira 2016-04-28 11:28:42 -07:00
parent f570b0e739 68f14c06cb
commit ebca8db7dc
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestStream.cs
View File

@ -181,7 +181,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
case FrameStreamState.Open: case FrameStreamState.Open:
if (cancellationToken.IsCancellationRequested) if (cancellationToken.IsCancellationRequested)
{ {
return TaskUtilities.GetCancelledZeroTask(); return TaskUtilities.GetCancelledZeroTask(cancellationToken);
} }
break; break;
case FrameStreamState.Closed: case FrameStreamState.Closed:

7
src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/TaskUtilities.cs
View File

@ -26,12 +26,15 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure
#endif #endif
} }
public static Task<int> GetCancelledZeroTask() public static Task<int> GetCancelledZeroTask(CancellationToken cancellationToken = default(CancellationToken))
{ {
// Task<int>.FromCanceled doesn't return Task<int> #if NETSTANDARD1_3
return Task.FromCanceled<int>(cancellationToken);
#else
var tcs = new TaskCompletionSource<int>(); var tcs = new TaskCompletionSource<int>();
tcs.TrySetCanceled(); tcs.TrySetCanceled();
return tcs.Task; return tcs.Task;
#endif
} }
} }
} }