2003-11-28 Zoltan Varga <vargaz@freemail.hu>

* gc.c: Fix hangs and error messages when GC_DONT_GC is set. svn path=/trunk/mono/; revision=20594
mono · Nov 28, 2003 · afdf9a0 · afdf9a0
1 parent f204bdc
commit afdf9a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
@@ -1,5 +1,7 @@
 2003-11-28  Zoltan Varga  <vargaz@freemail.hu>
 
+	* gc.c: Fix hangs and error messages when GC_DONT_GC is set.
+
 	* reflection.c (assembly_name_to_aname): Allow extra characters in
 	assembly names. Fixes #51468.
 

diff --git a/mono/metadata/gc.c b/mono/metadata/gc.c
@@ -168,6 +168,9 @@ mono_domain_finalize (MonoDomain *domain, guint32 timeout)
 	 */ 
 
 #if HAVE_BOEHM_GC
+	if (gc_disabled)
+		return TRUE;
+
 	GC_gcollect ();
 
 	done_event = CreateEvent (NULL, TRUE, FALSE, NULL);
@@ -634,9 +637,9 @@ void mono_gc_cleanup (void)
 #endif
 
 #ifdef ENABLE_FINALIZER_THREAD
-	ResetEvent (shutdown_event);
-	finished = TRUE;
 	if (!gc_disabled) {
+		ResetEvent (shutdown_event);
+		finished = TRUE;
 		finalize_notify ();
 		/* Finishing the finalizer thread, so wait a little bit... */
 		/* MS seems to wait for about 2 seconds */