Imported Upstream version 5.8.0.22

Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions

View File

@@ -132,11 +132,11 @@ namespace System.ServiceModel.Channels
protected override void OnClose (TimeSpan timeout)
{
DateTime start = DateTime.Now;
DateTime start = DateTime.UtcNow;
// this implicitly premises: TChannel is IChannel
foreach (IChannel ch in channels)
ch.Close (timeout - (DateTime.Now - start));
base.OnClose (timeout - (DateTime.Now - start));
ch.Close (timeout - (DateTime.UtcNow - start));
base.OnClose (timeout - (DateTime.UtcNow - start));
}
protected override IAsyncResult OnBeginClose (TimeSpan timeout, AsyncCallback callback, object state)