Imported Upstream version 4.6.0.165

Former-commit-id: d509131f71da404210981e7263b375675928eea7
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-25 10:13:16 +00:00
parent b95516a3dd
commit c911219690
458 changed files with 262 additions and 826 deletions

View File

@ -963,7 +963,7 @@ namespace System.Net
initialMethod = method;
SimpleAsyncResult.RunWithLock (locker, CheckIfForceWrite, inner => {
var synch = inner.CompletedSynchronously;
var synch = inner.CompletedSynchronouslyPeek;
if (inner.GotException) {
aread.SetCompleted (synch, inner.Exception);
@ -1374,7 +1374,7 @@ namespace System.Net
}
if (asyncWrite != null) {
asyncWrite.SetCompleted (inner.CompletedSynchronously, writeStream);
asyncWrite.SetCompleted (inner.CompletedSynchronouslyPeek, writeStream);
asyncWrite.DoCallback ();
asyncWrite = null;
}