src/share/classes/java/lang/ApplicationShutdownHooks.java

@@ -100,11 +100,15 @@
 
         for (Thread hook : threads) {
             hook.start();
         }
         for (Thread hook : threads) {
+            while (true) {
             try {
                 hook.join();
-            } catch (InterruptedException x) { }
+                    break;
+                } catch (InterruptedException ignored) {
+                }
+            }
         }
     }
 }