diff options
author | Martin Odersky <odersky@gmail.com> | 2010-08-18 17:12:44 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2010-08-18 17:12:44 +0000 |
commit | 4fb0d53f1c59c7b6ad0f2c79ac1b0c555e4cef91 (patch) | |
tree | d908d2a8734948060c7d1c98cc3223f2f8982264 /src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala | |
parent | e1232ab57a1f1e669b985debcfd0271768732384 (diff) | |
download | scala-4fb0d53f1c59c7b6ad0f2c79ac1b0c555e4cef91.tar.gz scala-4fb0d53f1c59c7b6ad0f2c79ac1b0c555e4cef91.tar.bz2 scala-4fb0d53f1c59c7b6ad0f2c79ac1b0c555e4cef91.zip |
Closes #3756. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala index 84fca0436d..244df8179a 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala @@ -462,13 +462,15 @@ abstract class ClassfileParser { } sym } - def lookupClass(name: Name) = + + def lookupClass(name: Name) = try { if (name.pos('.') == name.length) definitions.getMember(definitions.EmptyPackageClass, name.toTypeName) else - //definitions.getClass(name) // see ticket #2464 - try { definitions.getClass(name) } - catch { case _: FatalError => loadClassSymbol(name) } + definitions.getClass(name) // see tickets #2464, #3756 + } catch { + case _: FatalError => loadClassSymbol(name) + } innerClasses.get(name) match { case Some(entry) => |