Author: massi
Date: 2007-09-19 10:32:27 -0400 (Wed, 19 Sep 2007)
New Revision: 86014

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/mini.c
Log:
        * mini.c (mono_thread_abort): Correctly handle ThreadAbortException,
        fixes bug 325507.



Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2007-09-19 14:26:28 UTC (rev 86013)
+++ trunk/mono/mono/mini/ChangeLog      2007-09-19 14:32:27 UTC (rev 86014)
@@ -1,3 +1,7 @@
+2007-09-19  Massimiliano Mantione  <[EMAIL PROTECTED]>
+       * mini.c (mono_thread_abort): Correctly handle ThreadAbortException,
+       fixes bug 325507.
+
 2007-09-19  Martin Baulig  <[EMAIL PROTECTED]>
 
        * mini.c (mini_cleanup): Only call mono_debugger_cleanup() here;

Modified: trunk/mono/mono/mini/mini.c
===================================================================
--- trunk/mono/mono/mini/mini.c 2007-09-19 14:26:28 UTC (rev 86013)
+++ trunk/mono/mono/mini/mini.c 2007-09-19 14:32:27 UTC (rev 86014)
@@ -8927,7 +8927,8 @@
        /* handle_remove should be eventually called for this thread, too
        g_free (jit_tls);*/
 
-       if (mono_runtime_unhandled_exception_policy_get () == 
MONO_UNHANLED_POLICY_LEGACY) {
+       if ((mono_runtime_unhandled_exception_policy_get () == 
MONO_UNHANLED_POLICY_LEGACY) ||
+                       (obj->vtable->klass != 
mono_defaults.threadabortexception_class)) {
                mono_thread_exit ();
        } else {
                exit (mono_environment_exitcode_get ());

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to