From 038367c54530324b35d613656c8f929d4dd2ebc9 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Sat, 31 Oct 2009 14:13:11 +0000 Subject: [PATCH] 2009-10-31 Zoltan Varga MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * appdomain.c (mono_domain_try_unload): Applied patch from Romain Tartière. Fix returning when WaitForSingleObjectEx returns WAIT_IO_COMPLETION. svn path=/branches/mono-2-6/mono/; revision=145144 --- mono/metadata/ChangeLog | 5 +++++ mono/metadata/appdomain.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index 05583a4f7da..8b33b79e6b5 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,8 @@ +2009-10-31 Zoltan Varga + + * appdomain.c (mono_domain_try_unload): Applied patch from Romain Tartière. + Fix returning when WaitForSingleObjectEx returns WAIT_IO_COMPLETION. + 2009-10-31 Gonzalo Paniagua Javier * mono-perfcounters.c: add the "_Total" instance for CPU counters. diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c index a19666d64bf..3c25cf01c39 100644 --- a/mono/metadata/appdomain.c +++ b/mono/metadata/appdomain.c @@ -2207,11 +2207,12 @@ mono_domain_try_unload (MonoDomain *domain, MonoObject **exc) /* Wait for the thread */ while ((res = WaitForSingleObjectEx (thread_handle, INFINITE, TRUE) == WAIT_IO_COMPLETION)) { - if (mono_thread_has_appdomain_ref (mono_thread_current (), domain) && (mono_thread_interruption_requested ())) + if (mono_thread_has_appdomain_ref (mono_thread_current (), domain) && (mono_thread_interruption_requested ())) { /* The unload thread tries to abort us */ /* The icall wrapper will execute the abort */ CloseHandle (thread_handle); return; + } } CloseHandle (thread_handle); -- 2.11.4.GIT