2009-01-22 Zoltan Varga <vargaz@gmail.com>

	* mini.c (mini_init): When using xdebug, disable freeing of domains.

svn path=/trunk/mono/; revision=124136

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 4d3dc943c370a0fe6bc0c44839bec04764231319..b73749db7e3870198dc474c52cdcd6478eb89dde 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-22  Zoltan Varga  <vargaz@gmail.com>
+
+       * mini.c (mini_init): When using xdebug, disable freeing of domains.
+
 2009-01-21  Mark Probst  <mark.probst@gmail.com>
 
        * mini-ppc.c (mono_arch_delegate_invoke_impl): Return function

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index 861fea2590276f6aa6e239b899c5f36f72eb5435..534dd44b40d9e601ab05a2be9b535d17cd023b2b 100644 (file)
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -5061,8 +5061,11 @@ mini_init (const char *filename, const char *runtime_version)
 
        mono_arch_init ();
 
-       if (getenv ("MONO_XDEBUG"))
+       if (getenv ("MONO_XDEBUG")) {
                mono_xdebug_init ();
+               /* So methods for multiple domains don't have the same address */
+               mono_dont_free_domains = TRUE;
+       }
 
        mono_trampolines_init ();