summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-03-24 14:16:18 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-03-24 14:16:18 +1000
commitee864c1d77ecbac354f4dae71b247a54d053fbdb (patch)
tree8387090e2ed97098be4c5f240a403d155a99fa5f /src/compiler
parent0abafb54f3c90072798c6987933c924216a8e1f7 (diff)
parenta180f5f24f2094112a01cdb02e0e8f218db68d70 (diff)
downloadscala-ee864c1d77ecbac354f4dae71b247a54d053fbdb.tar.gz
scala-ee864c1d77ecbac354f4dae71b247a54d053fbdb.tar.bz2
scala-ee864c1d77ecbac354f4dae71b247a54d053fbdb.zip
Merge pull request #4364 from som-snytt/issue/sessiontest
SI-9170 More flexible SessionTest
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/Global.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index 1c9dbad4dd..b233acf271 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -1551,7 +1551,8 @@ class Global(var currentSettings: Settings, var reporter: Reporter)
if (reporter.hasErrors) {
for ((sym, file) <- symSource.iterator) {
- sym.reset(new loaders.SourcefileLoader(file))
+ if (file != null)
+ sym.reset(new loaders.SourcefileLoader(file))
if (sym.isTerm)
sym.moduleClass reset loaders.moduleClassLoader
}