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

@ -444,7 +444,7 @@ namespace System.ServiceModel.Channels
bool lockTaken = false;
try
{
// We need this lock only in [....] reply case. In this case, we hopped the thread in the request side, so it's possible to send the response here
// We need this lock only in sync reply case. In this case, we hopped the thread in the request side, so it's possible to send the response here
// before the TransportIntegrationHandler is ready on another thread (thus a race condition). So we use the lock here. In the incoming path, we won't
// release the lock until the TransportIntegrationHandler is ready. Once we get the lock on the outgoing path, we can then call Wait() on this handler safely.
Monitor.TryEnter(this.ThisLock, TimeoutHelper.ToMilliseconds(helper.RemainingTime()), ref lockTaken);
@ -615,7 +615,7 @@ namespace System.ServiceModel.Channels
this.cancellationTokenSource.Dispose();
this.wasProcessInboundRequestSuccessful = true;
//// shortcut scenario
//// Currently we are always doing [....] send even async send is enabled.
//// Currently we are always doing sync send even async send is enabled.
this.SendAndClose(t.Result);
}
else if (this.isAsyncReply)