summaryrefslogtreecommitdiff
path: root/src/repl
diff options
context:
space:
mode:
authorSimon Ochsenreither <simon@ochsenreither.de>2013-07-27 04:17:24 +0200
committerSimon Ochsenreither <simon@ochsenreither.de>2013-08-15 03:04:32 +0200
commitbcf35bbcb8a8fcda8452bca7409c69cbfb33a22d (patch)
treeeb2488d38613a863b28d0b675eaa5fb9d6138c21 /src/repl
parentf17fb5eaa545490c761acd4f6979a619f919ac86 (diff)
downloadscala-bcf35bbcb8a8fcda8452bca7409c69cbfb33a22d.tar.gz
scala-bcf35bbcb8a8fcda8452bca7409c69cbfb33a22d.tar.bz2
scala-bcf35bbcb8a8fcda8452bca7409c69cbfb33a22d.zip
SI-7681 Remove scala.tools.nsc.io.DaemonThreadFactory
Diffstat (limited to 'src/repl')
-rw-r--r--src/repl/scala/tools/nsc/interpreter/IMain.scala8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/IMain.scala b/src/repl/scala/tools/nsc/interpreter/IMain.scala
index 3a71930383..5bfad7a159 100644
--- a/src/repl/scala/tools/nsc/interpreter/IMain.scala
+++ b/src/repl/scala/tools/nsc/interpreter/IMain.scala
@@ -26,7 +26,7 @@ import javax.script.{AbstractScriptEngine, Bindings, ScriptContext, ScriptEngine
import java.io.{ StringWriter, Reader }
import java.util.Arrays
import IMain._
-import java.util.concurrent.Future
+import scala.concurrent.{ Future, ExecutionContext }
import scala.reflect.runtime.{ universe => ru }
import scala.reflect.{ ClassTag, classTag }
import StdReplTags._
@@ -142,10 +142,8 @@ class IMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings: Set
def initialize(postInitSignal: => Unit) {
synchronized {
if (_isInitialized == null) {
- _isInitialized = io.spawn {
- try _initialize()
- finally postInitSignal
- }
+ _isInitialized =
+ Future(try _initialize() finally postInitSignal)(ExecutionContext.global)
}
}
}