From 5cf75c08089a4aec317690786c272df506509ec3 Mon Sep 17 00:00:00 2001 From: Paolo Molaro Date: Thu, 2 Mar 2006 11:28:44 +0000 Subject: [PATCH] Thu Mar 2 12:27:41 CET 2006 Paolo Molaro * threads.c: make sure the domain is correct, too when doing mono_thread_attach (). svn path=/trunk/mono/; revision=57499 --- mono/metadata/ChangeLog | 6 ++++++ mono/metadata/threads.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index e90e87efe03..3ab22a3c2b6 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,9 @@ + +Thu Mar 2 12:27:41 CET 2006 Paolo Molaro + + * threads.c: make sure the domain is correct, too when doing + mono_thread_attach (). + 2006-03-01 Zoltan Varga * class.c (mono_class_create_from_typedef): Mark classes using CharSet.Auto as unicode on diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c index 243064a28a8..34de1a3ca23 100644 --- a/mono/metadata/threads.c +++ b/mono/metadata/threads.c @@ -395,6 +395,8 @@ mono_thread_attach (MonoDomain *domain) gsize tid; if ((thread = mono_thread_current ())) { + if (domain != mono_domain_get ()) + mono_domain_set (domain, TRUE); /* Already attached */ return thread; } -- 2.25.1