2004-02-02 Zoltan Varga <vargaz@freemail.hu>

	* gc.c (ves_icall_System_GC_WaitForPendingFinalizers): Fix check for
	the finalizer thread.

svn path=/trunk/mono/; revision=22708

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index b10c39482168bf21496505279732ee199c710886..8f504fc166577a897a7a42000d4678231929828f 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -3,6 +3,9 @@
        * gc.c threads.c: Make the finalizer thread a normal managed thread so
        the finalizer code can use thread functionality.
 
+       * gc.c (ves_icall_System_GC_WaitForPendingFinalizers): Fix check for 
+       the finalizer thread.
+
        * threads.c: Make some functions more robust.
 
        * loader.c (mono_lookup_pinvoke_call): Another attempt at fixing #22532.

diff --git a/mono/metadata/gc.c b/mono/metadata/gc.c
index aa8b368c2c277596e5540331442f7d21500ecb07..b548bfa3106ef7a2474b2c01830b3f6820589e69 100644 (file)
--- a/mono/metadata/gc.c
+++ b/mono/metadata/gc.c
@@ -261,7 +261,7 @@ ves_icall_System_GC_WaitForPendingFinalizers (void)
        if (!GC_should_invoke_finalizers ())
                return;
 
-       if (GetCurrentThread () == gc_thread)
+       if (mono_thread_current () == gc_thread)
                /* Avoid deadlocks */
                return;