luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4549 from retronym/topic/currun 

Avoid NPE on Run.<init>
This commit is contained in:
eugene yokota 2019-02-21 21:11:50 -05:00 committed by GitHub
parent 45f5019ee0 3cbbe93c6e
commit b747309fb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main-actions/src/main/scala/sbt/compiler/Eval.scala
View File

@ -89,7 +89,10 @@ final class Eval(
*/
final class EvalGlobal(settings: Settings, reporter: Reporter)
extends Global(settings, reporter) {
override def currentRun: Run = curRun
override def currentRun: Run = curRun match {
case null => super.currentRun // https://github.com/scala/bug/issues/11381
case r => r
}
var curRun: Run = null
}
lazy val global: EvalGlobal = new EvalGlobal(settings, reporter)