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

Merge pull request #6073 from eatkins/fix-console-cancellation 

Fix console task cancellation
This commit is contained in:
eugene yokota 2020-11-06 17:37:06 -05:00 committed by GitHub
parent 92cbaa925f ceee8ac492
commit ac6c962a63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala
View File

@ -457,7 +457,7 @@ object Terminal {
extends SimpleInputStream extends SimpleInputStream
with AutoCloseable { with AutoCloseable {
private[this] val isRaw = new AtomicBoolean(false) private[this] val isRaw = new AtomicBoolean(false)
final def write(bytes: Int*): Unit = readThread.synchronized { final def write(bytes: Int*): Unit = buffer.synchronized {
bytes.foreach(b => buffer.put(b)) bytes.foreach(b => buffer.put(b))
} }
def setRawMode(toggle: Boolean): Unit = { def setRawMode(toggle: Boolean): Unit = {
@ -488,7 +488,7 @@ object Terminal {
@tailrec def impl(): Unit = { @tailrec def impl(): Unit = {
val _ = readQueue.take val _ = readQueue.take
val b = in.read val b = in.read
buffer.put(b) buffer.synchronized(buffer.put(b))
if (Thread.interrupted() || (b == -1 && isRaw.get)) closed.set(true) if (Thread.interrupted() || (b == -1 && isRaw.get)) closed.set(true)
else impl() else impl()
} }