summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/interpreter/ILoopInit.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-08-23 22:57:15 +0000
committerPaul Phillips <paulp@improving.org>2011-08-23 22:57:15 +0000
commit0e74720c491ce13e5e904e0bc39e9a60af26f37c (patch)
tree739584c007c30a6b1974a42674bb1e9b5aa4c721 /src/compiler/scala/tools/nsc/interpreter/ILoopInit.scala
parent3a1463cd833175bdaa7a31d96a41a0d926b0e9db (diff)
downloadscala-0e74720c491ce13e5e904e0bc39e9a60af26f37c.tar.gz
scala-0e74720c491ce13e5e904e0bc39e9a60af26f37c.tar.bz2
scala-0e74720c491ce13e5e904e0bc39e9a60af26f37c.zip
Some 11th hour modifications with the dual purp...
Some 11th hour modifications with the dual purpose of a smooth console life for sbt and so the repl can be used on google app engine. Although this patch may look largish to be entering at RC4, there isn't a lot going on. It's trying to make these dangerous things: - property and environment variable accesses - thread creation - signal handler installation happpen in a sufficiently uniform way that people who don't want them and places who don't allow them are not left with an unfixable situation where things blow up inside private methods. Also, the (ahem) lower than usual elegance levels are due to it being intended for 2.9.x as well. Review by harrah.
Diffstat (limited to 'src/compiler/scala/tools/nsc/interpreter/ILoopInit.scala')
-rw-r--r--src/compiler/scala/tools/nsc/interpreter/ILoopInit.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/interpreter/ILoopInit.scala b/src/compiler/scala/tools/nsc/interpreter/ILoopInit.scala
index a9c092861f..6ebe3f7362 100644
--- a/src/compiler/scala/tools/nsc/interpreter/ILoopInit.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/ILoopInit.scala
@@ -47,7 +47,7 @@ trait ILoopInit {
}
ignoring(classOf[Exception]) {
SignalManager("INT") = {
- if (intp == null)
+ if (intp == null || intp.lineManager == null)
onExit()
else if (intp.lineManager.running)
intp.lineManager.cancel()