Imported Upstream version 6.4.0.137

Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-07-26 19:53:28 +00:00
parent e9207cf623
commit ef583813eb
2712 changed files with 74169 additions and 40587 deletions

View File

@@ -83,8 +83,14 @@ namespace System.Threading
lock (this) {
_unregistered = true;
if (_callsInProcess == 0 && _finalEvent != null)
if (_callsInProcess == 0 && _finalEvent != null) {
#if NETCORE
throw new NotImplementedException ();
#else
NativeEventCalls.SetEvent (_finalEvent.SafeWaitHandle);
_finalEvent = null;
#endif
}
}
} catch (ObjectDisposedException) {
// Can happen if we called Unregister before we had time to execute Wait
@@ -105,8 +111,14 @@ namespace System.Threading
lock (this)
{
_callsInProcess--;
if (_unregistered && _callsInProcess == 0 && _finalEvent != null)
if (_unregistered && _callsInProcess == 0 && _finalEvent != null) {
#if NETCORE
EventWaitHandle.Set (_finalEvent.SafeWaitHandle);
#else
NativeEventCalls.SetEvent (_finalEvent.SafeWaitHandle);
#endif
_finalEvent = null;
}
}
}
}