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

@ -414,7 +414,7 @@ namespace System.ServiceModel.Dispatcher
if (loop_thread == null)
return;
close_started = DateTime.Now;
close_started = DateTime.UtcNow;
close_timeout = timeout;
loop = false;
creator_handle.Set ();
@ -467,7 +467,7 @@ namespace System.ServiceModel.Dispatcher
}
else {
try {
ch.Close (close_timeout - (DateTime.Now - close_started));
ch.Close (close_timeout - (DateTime.UtcNow - close_started));
} catch (Exception ex) {
// FIXME: log it.
Logger.Error (String.Format ("Exception on closing channel ({0})", ch.GetType ()), ex);