Only register the AppDomain.ProcessExit event handler when necessary.

1 files changed, 9 insertions, 1 deletions

diff --git a/openjdk/java/lang/Shutdown.java b/openjdk/java/lang/Shutdown.java
index 69304a94..947f0e39 100644
--- a/openjdk/java/lang/Shutdown.java
+++ b/openjdk/java/lang/Shutdown.java
@@ -60,6 +60,9 @@ class Shutdown {
     // the index of the currently running shutdown hook to the hooks array
     private static int currentRunningHook = 0;
 
+    // [IKVM] have we registered the AppDomain.ProcessExit event handler?
+    private static boolean registeredProcessExit;
+
     /* The preceding static fields are protected by this lock */
     private static class Lock { };
     private static Object lock = new Lock();
@@ -74,7 +77,7 @@ class Shutdown {
         }
     }
     
-    static {
+    private static void registerProcessExit() {
         try {
             // MONOBUG Mono doesn't support starting a new thread during ProcessExit
             // (and application shutdown hooks are based on threads)
@@ -131,6 +134,11 @@ class Shutdown {
                     throw new IllegalStateException("Shutdown in progress");
             }
 
+            if (!registeredProcessExit) {
+                registeredProcessExit = true;
+                registerProcessExit();
+            }
+
             hooks[slot] = hook;
         }
     }