Merge from HEAD.

svn path=/branches/mono-1-0/mono/; revision=35293
baulig · Oct 25, 2004 · 214dbb1 · 214dbb1
1 parent 35a5b8b
commit 214dbb1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-25  Zoltan Varga  <vargaz@freemail.hu>
+
+	* gc.c (finalize_domain_objects): Call GC_invoke_finalizers () so
+	pending finalizers are not invoked after the appdomain has been 
+	unloaded. Fixes #67862.
+
 2004-10-08  Zoltan Varga  <vargaz@freemail.hu>
 
 	* threads.c (abort_appdomain_thread): Fix unref errors.

diff --git a/mono/metadata/gc.c b/mono/metadata/gc.c
@@ -555,6 +555,9 @@ finalize_domain_objects (DomainFinalizationReq *req)
 		g_ptr_array_free (objs, TRUE);
 	}
 
+	/* Process finalizers which are already in the queue */
+	GC_invoke_finalizers ();
+
 	/* printf ("DONE.\n"); */
 	SetEvent (req->done_event);