diff -r 98f41520c884 -r 7d619f151e36 jdk/src/java.base/share/classes/java/lang/ApplicationShutdownHooks.java
--- a/jdk/src/java.base/share/classes/java/lang/ApplicationShutdownHooks.java	Thu Jun 23 19:58:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/ApplicationShutdownHooks.java	Fri Jun 24 06:47:32 2016 +0100
@@ -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) {
+                }
+            }
         }
     }
 }