diff options
| author | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-11-04 13:52:53 +0000 |
|---|---|---|
| committer | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-11-04 13:52:53 +0000 |
| commit | 78c1e2f94ed3b324ffd8003945d94d00260b5e3b (patch) | |
| tree | 1d94442c8f6535561b4ada05dddde1f68eb5f896 /src/compiler/scala/tools/nsc/typechecker/Namers.scala | |
| parent | 29be721e25c761a4d58211d1bd698ee3e722fcb3 (diff) | |
| download | scala-78c1e2f94ed3b324ffd8003945d94d00260b5e3b.tar.gz scala-78c1e2f94ed3b324ffd8003945d94d00260b5e3b.tar.bz2 scala-78c1e2f94ed3b324ffd8003945d94d00260b5e3b.zip | |
Check for npe in the last commit
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Namers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Namers.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index f8e69cf902..d2a5523093 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -89,7 +89,7 @@ trait Namers { self: Analyzer => if (sym.isModule && sym.moduleClass != NoSymbol) updatePosFlags(sym.moduleClass, pos, moduleClassFlags(flags)) var companion: Symbol = NoSymbol - if (sym.owner.isPackageClass && {companion = companionSymbolOf(sym, context); true} && + if (sym.owner.isPackageClass && {companion = companionSymbolOf(sym, context); companion != NoSymbol} && (companion.rawInfo.isInstanceOf[loaders.SymbolLoader] || companion.rawInfo.isComplete && runId(sym.validTo) != currentRunId)) // pre-set linked symbol to NoType, in case it is not loaded together with this symbol. |