2010-01-28 Zoltan Varga <vargaz@gmail.com>

	* domain.c (mono_domain_free): Send the END_UNLOAD profiler event before
	calling the JIT domain cleanup hook.

svn path=/branches/mono-2-6/mono/; revision=150450

mono/metadata/ChangeLog

@@ -1,3 +1,8 @@
+2010-01-28  Zoltan Varga  <vargaz@gmail.com>
+
+	* domain.c (mono_domain_free): Send the END_UNLOAD profiler event before
+	calling the JIT domain cleanup hook.
+
 2010-01-28  Rodrigo Kumpera  <rkumpera@novell.com>
 
 	* pedump.c (main): Properly set the verifier mode when running the metadata

mono/metadata/domain.c

@@ -1874,9 +1874,6 @@ mono_domain_free (MonoDomain *domain, gboolean force)
 
 	mono_profiler_appdomain_event (domain, MONO_PROFILE_START_UNLOAD);
 
-	if (free_domain_hook)
-		free_domain_hook (domain);
-
 	mono_debug_domain_unload (domain);
 
 	mono_appdomains_lock ();
@@ -1922,7 +1919,14 @@ mono_domain_free (MonoDomain *domain, gboolean force)
 	g_slist_free (domain->domain_assemblies);
 	domain->domain_assemblies = NULL;
 
-	mono_gc_clear_domain (domain);
+	/* 
+	 * Send this after the assemblies have been unloaded and the domain is still in a 
+	 * usable state.
+	 */
+	mono_profiler_appdomain_event (domain, MONO_PROFILE_END_UNLOAD);
+
+	if (free_domain_hook)
+		free_domain_hook (domain);
 
 	/* FIXME: free delegate_hash_table when it's used */
 	if (domain->search_path) {
@@ -2006,8 +2010,6 @@ mono_domain_free (MonoDomain *domain, gboolean force)
 
 	/* FIXME: anything else required ? */
 
-	mono_profiler_appdomain_event (domain, MONO_PROFILE_END_UNLOAD);
-
 	mono_gc_free_fixed (domain);
 
 	mono_perfcounters->loader_appdomains--;