8157528: jdk/jshell/ExecutionControlTest.java failed intermittently with NPE

Reviewed-by: jlahoda
2016-05-23 13:05:04 -07:00 · 2016-05-23 13:05:04 -07:00 · 7bcc48f00e
commit 7bcc48f00e
parent 5d1f9c9918
1 changed files with 2 additions and 1 deletions
--- a/langtools/test/jdk/jshell/LocalExecutionControl.java
+++ b/langtools/test/jdk/jshell/LocalExecutionControl.java
@ -171,6 +171,7 @@ class LocalExecutionControl implements ExecutionControl {
                Thread[] threadList = new Thread[execThreadGroup.activeCount()];
                execThreadGroup.enumerate(threadList);
                for (Thread thread : threadList) {
+                    if (thread != null)
                        thread.join();
                }