From: Zoltan Varga <vargaz@gmail.com>
Date: Thu, 22 Jan 2009 00:22:53 +0000 (-0000)
Subject: 2009-01-22  Zoltan Varga  <vargaz@gmail.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=f2b0b5aa1aabc9fe3da0801607886c1ef14f9402;p=mono.git

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 4d3dc943c37..b73749db7e3 100644
--- 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 861fea25902..534dd44b40d 100644
--- 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 ();