From 5811e8a2579b4822f0f247dd843b346a76e00780 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 31 Mar 2016 01:28:55 -0400 Subject: [PATCH] Fixes #32. Don't inject thread sleep by default. Thread sleeping interferes with scripted test when the build cannot be loaded. The scripted test gets stuck, and jstack shows java.lang.Thread.State: TIMED_WAITING (sleeping) at java.lang.Thread.sleep(Native Method) at sbt.internal.util.InputStreamWrapper.read(LineReader.scala:138) at jline.internal.NonBlockingInputStream.read(NonBlockingInputStream.java:2 45) .... at sbt.internal.util.JLine$.withJLine(LineReader.scala:118) at sbt.internal.util.JLine.readLine(LineReader.scala:18) at sbt.BuiltinCommands$.sbt$BuiltinCommands$$doLoadFailed(Main.scala:460) --- .../src/main/scala/sbt/internal/util/LineReader.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala b/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala index 93552b518..712071684 100644 --- a/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala +++ b/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala @@ -124,7 +124,7 @@ private[sbt] object JLine { def simple( historyPath: Option[File], handleCONT: Boolean = HandleCONT, - injectThreadSleep: Boolean = true + injectThreadSleep: Boolean = false ): SimpleReader = new SimpleReader(historyPath, handleCONT, injectThreadSleep) val MaxHistorySize = 500 val HandleCONT = !java.lang.Boolean.getBoolean("sbt.disable.cont") && Signals.supported(Signals.CONT) @@ -147,7 +147,7 @@ final class FullReader( historyPath: Option[File], complete: Parser[_], val handleCONT: Boolean = JLine.HandleCONT, - val injectThreadSleep: Boolean = true + val injectThreadSleep: Boolean = false ) extends JLine { protected[this] val reader = { @@ -160,5 +160,5 @@ final class FullReader( class SimpleReader private[sbt] (historyPath: Option[File], val handleCONT: Boolean, val injectThreadSleep: Boolean) extends JLine { protected[this] val reader = JLine.createReader(historyPath, injectThreadSleep) } -object SimpleReader extends SimpleReader(None, JLine.HandleCONT, true) +object SimpleReader extends SimpleReader(None, JLine.HandleCONT, false)