From 78c1e2f94ed3b324ffd8003945d94d00260b5e3b Mon Sep 17 00:00:00 2001 From: Hubert Plociniczak Date: Thu, 4 Nov 2010 13:52:53 +0000 Subject: Check for npe in the last commit --- src/compiler/scala/tools/nsc/typechecker/Namers.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. -- cgit v1.2.3