r91033 - trunk/mono/mono/metadata

[Paolo Molaro]

Author: lupus
Date: 2007-12-10 04:38:25 -0500 (Mon, 10 Dec 2007)
New Revision: 91033

Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/threads.c
Log:

Mon Dec 10 11:06:23 CET 2007 Paolo Molaro <lu...@ximian.com>

* threads.c: turn an assert into a non-fatal warning.

Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2007-12-10 09:29:01 UTC (rev 91032)
+++ trunk/mono/mono/metadata/ChangeLog 2007-12-10 09:38:25 UTC (rev 91033)
@@ -1,3 +1,8 @@
+
+Mon Dec 10 11:06:23 CET 2007 Paolo Molaro <lu...@ximian.com>
+
+ * threads.c: turn an assert into a non-fatal warning.
+
2007-12-09 Robert Jordan <rob...@gmx.net>

* icall.c (GetVirtualMethod): Add missing argument validation.

Modified: trunk/mono/mono/metadata/threads.c
===================================================================
--- trunk/mono/mono/metadata/threads.c 2007-12-10 09:29:01 UTC (rev 91032)
+++ trunk/mono/mono/metadata/threads.c 2007-12-10 09:38:25 UTC (rev 91033)
@@ -383,7 +383,11 @@
{
MonoThread *current_thread = mono_thread_current ();

- g_assert (current_thread && current_thread->small_id >= 0);
+ if (!(current_thread && current_thread->small_id >= 0)) {
+ static MonoThreadHazardPointers emerg_hazard_table;
+ g_warning ("Thread %p may have been prematurely finalized", current_thread);
+ return &emerg_hazard_table;
+ }

return &hazard_table [current_thread->small_id];
}