diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-10 11:03:52 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-10 11:03:52 -0700 |
| commit | 76e3758e46d633573e5d4a678a7cd9e9433804cc (patch) | |
| tree | 09a62cbc2f43d5dad1084bef8fba16e81629dad9 | |
| parent | 51a413e3327d9050f07377933eb1ca243d52c4ab (diff) | |
| parent | aa93dafcbec6cb3436e0222d633611769ebf74bf (diff) | |
| download | scala-76e3758e46d633573e5d4a678a7cd9e9433804cc.tar.gz scala-76e3758e46d633573e5d4a678a7cd9e9433804cc.tar.bz2 scala-76e3758e46d633573e5d4a678a7cd9e9433804cc.zip | |
Merge pull request #3609 from xeno-by/ticket/8370
SI-8370 fixes an infinite loop in repl init
| -rw-r--r-- | src/repl/scala/tools/nsc/interpreter/IMain.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/IMain.scala b/src/repl/scala/tools/nsc/interpreter/IMain.scala index 8bb5757bbb..9c853fb514 100644 --- a/src/repl/scala/tools/nsc/interpreter/IMain.scala +++ b/src/repl/scala/tools/nsc/interpreter/IMain.scala @@ -306,7 +306,7 @@ class IMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings: Set */ override protected def findAbstractFile(name: String): AbstractFile = super.findAbstractFile(name) match { - case null => translatePath(name) map (super.findAbstractFile(_)) orNull + case null if _initializeComplete => translatePath(name) map (super.findAbstractFile(_)) orNull case file => file } } |