--- old/src/share/classes/java/lang/ApplicationShutdownHooks.java	2017-11-26 23:06:35.580197315 -0800
+++ new/src/share/classes/java/lang/ApplicationShutdownHooks.java	2017-11-26 23:06:35.343193912 -0800
@@ -102,9 +102,13 @@
             hook.start();
         }
         for (Thread hook : threads) {
-            try {
-                hook.join();
-            } catch (InterruptedException x) { }
+            while (true) {
+                try {
+                    hook.join();
+                    break;
+                } catch (InterruptedException ignored) {
+                }
+            }
         }
     }
 }