Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@ -481,7 +481,7 @@ namespace System.ServiceModel.Channels
// AsyncResult.AsyncCompletionWrapperCallback takes care of catching the exceptions for us.
IAsyncResult result = this.channel.UdpOutputChannel.BeginClose(this.timeoutHelper.RemainingTime(), this.PrepareAsyncCompletion(completeCloseOutputChannelCallback), this);
// SyncContinue calls CompleteCloseOutputChannel for us in [....] case.
// SyncContinue calls CompleteCloseOutputChannel for us in sync case.
return this.SyncContinue(result);
}
@ -490,7 +490,7 @@ namespace System.ServiceModel.Channels
// AsyncResult.AsyncCompletionWrapperCallback takes care of catching the exceptions for us.
IAsyncResult result = this.baseBeginClose(this.timeoutHelper.RemainingTime(), this.PrepareAsyncCompletion(completeBaseCloseCallback), this);
// SyncContinue calls CompleteBaseClose for us in [....] case.
// SyncContinue calls CompleteBaseClose for us in sync case.
return this.SyncContinue(result);
}
}

View File

@ -664,7 +664,7 @@ namespace System.ServiceModel.Channels
if (completedSynchronously && this.retransmissionEnabled)
{
// initial send completed [....], now we need to start the retransmission process...
// initial send completed sync, now we need to start the retransmission process...
completedSynchronously = this.BeginRetransmission();
}