Imported Upstream version 5.16.0.100

Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-07 15:19:03 +00:00
parent 0a9828183b
commit 7d7f676260
4419 changed files with 170950 additions and 90273 deletions

View File

@@ -232,8 +232,8 @@ namespace System.IO {
conn = -1;
}
if (!thread.Join (2000))
thread.Abort ();
while (!thread.Join (2000))
thread.Interrupt ();
requestStop = false;
started = false;