Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -98,17 +98,16 @@ namespace System.Threading
private void DoCallBack (object timedOut)
{
if (_callback != null) {
try {
_callback (_state, (bool)timedOut);
} catch {}
}
lock (this)
{
_callsInProcess--;
if (_unregistered && _callsInProcess == 0 && _finalEvent != null)
NativeEventCalls.SetEvent (_finalEvent.SafeWaitHandle);
try {
if (_callback != null)
_callback (_state, (bool)timedOut);
} finally {
lock (this)
{
_callsInProcess--;
if (_unregistered && _callsInProcess == 0 && _finalEvent != null)
NativeEventCalls.SetEvent (_finalEvent.SafeWaitHandle);
}
}
}