diff options
| author | Vlad Brezae <brezaevlad@gmail.com> | 2017-02-27 23:05:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-27 23:05:27 +0300 |
| commit | cb21cf251997fb6caecf6406a8b91ebed7af81c9 (patch) | |
| tree | 5611b7fafed682890458b8fe89f059ed45edf97b | |
| parent | f88093694ba41081548d831df07ecd9071f221cf (diff) | |
| parent | bc25f308cabad9bb333a1d596fe89881205cc82f (diff) | |
Merge pull request #4434 from BrzVlad/fix-unload-hang
[threads] Don't ignore abort requests in abort protected blocks
| -rw-r--r-- | mono/metadata/threads.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c index c756a06c940..3461f81e325 100644 --- a/mono/metadata/threads.c +++ b/mono/metadata/threads.c @@ -4844,13 +4844,6 @@ async_abort_critical (MonoThreadInfo *info, gpointer ud) if (mono_get_eh_callbacks ()->mono_install_handler_block_guard (mono_thread_info_get_suspend_state (info))) return MonoResumeThread; - /* - The target thread is running at least one protected block, which must not be interrupted, so we give up. - The protected block code will give them a chance when appropriate. - */ - if (mono_thread_get_abort_prot_block_count (thread) > 0) - return MonoResumeThread; - /*someone is already interrupting it*/ if (!mono_thread_set_interruption_requested (thread)) return MonoResumeThread; |