Disable AppDomain.ProcessExit hook to run shutdown hooks when running…

… on Mono to workaround https://bugzilla.xamarin.com/show_bug.cgi?id=5650
mono · Jun 15, 2012 · 01ae451 · 01ae451
1 parent 62b5ef0
commit 01ae451
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/classpath/ikvm/internal/Util.java b/classpath/ikvm/internal/Util.java
@@ -7,6 +7,8 @@ public final class Util
 {
     private Util() {}
 
+    public static final boolean MONO = cli.System.Type.GetType("Mono.Runtime") != null;
+
     public static final boolean WINDOWS;
     public static final boolean MACOSX;
 

diff --git a/openjdk/java/lang/Shutdown.java b/openjdk/java/lang/Shutdown.java
@@ -75,9 +75,14 @@ static void setRunFinalizersOnExit(boolean run) {
 
     static {
         try {
-            // AppDomain.ProcessExit has a LinkDemand, so we have to have a separate method
-            registerShutdownHook();
-            if (false) throw new cli.System.Security.SecurityException();
+            // MONOBUG Mono doesn't support starting a new thread during ProcessExit
+            // (and application shutdown hooks are based on threads)
+            // see https://bugzilla.xamarin.com/show_bug.cgi?id=5650
+            if (!ikvm.internal.Util.MONO) {
+                // AppDomain.ProcessExit has a LinkDemand, so we have to have a separate method
+                registerShutdownHook();
+                if (false) throw new cli.System.Security.SecurityException();
+            }
         }
         catch (cli.System.Security.SecurityException _) {
         }