Await threads termination

pkukielka · Jun 6, 2018 · 4730ced · 4730ced
1 parent 4378e54
commit 4730ced
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
@@ -10,6 +10,7 @@ package nsc
 import java.io.{File, FileNotFoundException, IOException}
 import java.net.URL
 import java.nio.charset.{Charset, CharsetDecoder, IllegalCharsetNameException, UnsupportedCharsetException}
+import java.util.concurrent.TimeUnit
 
 import scala.collection.{immutable, mutable}
 import io.{AbstractFile, Path, SourceReader}
@@ -445,7 +446,9 @@ class Global(var currentSettings: Settings, reporter0: Reporter)
         _synchronizeNames = false
 
         ec match {
-          case ecxs: ExecutionContextExecutorService => ecxs.shutdown()
+          case ecxs: ExecutionContextExecutorService =>
+            ecxs.shutdown()
+            assert(ecxs.awaitTermination(1, TimeUnit.MINUTES))
           case _ =>
         }
       }