summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-11-04 04:17:02 +0000
committerPaul Phillips <paulp@improving.org>2011-11-04 04:17:02 +0000
commit53427f86cd4fd240dfa7ee022f4d6c210c56a3e0 (patch)
tree45d5c6ddce5e634e2bf537567243f777ba7d8870 /src/compiler
parent22d125f1e3beef4cc3dd42377273c35f8cb69d07 (diff)
downloadscala-53427f86cd4fd240dfa7ee022f4d6c210c56a3e0.tar.gz
scala-53427f86cd4fd240dfa7ee022f4d6c210c56a3e0.tar.bz2
scala-53427f86cd4fd240dfa7ee022f4d6c210c56a3e0.zip
Repl deadlock fix.
Found the cure for the hanging repl introduced three comits ago. No review.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/interpreter/ILoop.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
index 1f19740353..cc06987dc4 100644
--- a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
@@ -99,7 +99,7 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter)
def prompt = ILoop.this.prompt
}
override protected def createLineManager(): Line.Manager =
- if (ReplPropsKludge.noThreadCreation(settings)) null else new Line.Manager(outer.classLoader) {
+ if (ReplPropsKludge.noThreadCreation(settings)) null else new Line.Manager(parentClassLoader) {
override def onRunaway(line: Line[_]): Unit = {
val template = """
|// She's gone rogue, captain! Have to take her out!