luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6071 from eatkins/join-thread 

Throw timeoutexception in JoinThread
This commit is contained in:
eugene yokota 2020-11-06 17:37:24 -05:00 committed by GitHub
parent ac6c962a63 748dfd6e67
commit 031d2c6655
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main-command/src/main/scala/sbt/internal/util/JoinThread.scala
View File

@ -9,23 +9,22 @@ package sbt.internal.util
import scala.annotation.tailrec
import scala.concurrent.duration._
import java.util.concurrent.TimeoutException
object JoinThread {
implicit class ThreadOps(val t: Thread) extends AnyVal {
def joinFor(duration: FiniteDuration): Unit = {
val deadline = duration.fromNow
var exception: Option[InterruptedException] = None
@tailrec def impl(): Unit = {
try {
t.interrupt()
t.join(10)
} catch { case e: InterruptedException => exception = Some(e) }
} catch { case e: InterruptedException => }
if (t.isAlive && !deadline.isOverdue) impl()
}
impl()
if (t.isAlive) {
System.err.println(s"Unable to join thread $t after $duration")
exception.foreach(throw _)
throw new TimeoutException(s"Unable to join thread $t after $duration")
}
}
}