Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions

View File

@ -159,7 +159,11 @@ namespace System.Net.NetworkInformation {
{
user_async_state = null;
worker = null;
cts = null;
if (cts != null) {
cts.Dispose();
cts = null;
}
if (PingCompleted != null)
PingCompleted (this, e);
@ -596,6 +600,8 @@ namespace System.Net.NetworkInformation {
if ((worker != null) || (cts != null))
throw new InvalidOperationException ("Another SendAsync operation is in progress");
cts = new CancellationTokenSource();
var task = Task<PingReply>.Factory.StartNew (
() => Send (address, timeout, buffer, options), cts.Token);