Merge from HEAD.

svn path=/branches/mono-1-0/mono/; revision=35293

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index b43385bc0577afa105be5a37b5d19cd71a3109f1..f26a34e418c532608529ceec43c8b2999e0254a7 100644 (file)
--- 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
index 3a9db3a1c62518de346ad3b6bbdca7abc4ebd28b..9bfc8d8184d79bae551bbfcf706b671859b200a1 100644 (file)
--- 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);