summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-12-23 02:57:42 +0000
committerPaul Phillips <paulp@improving.org>2010-12-23 02:57:42 +0000
commit7418d531f0309aa43c7002386b35e73742f063a3 (patch)
treebbacc9b1a91fc43568621aa2de5ecbacb589f24a /src
parentd519e34eb5734c7490bf88262e3abb6a56af1286 (diff)
downloadscala-7418d531f0309aa43c7002386b35e73742f063a3.tar.gz
scala-7418d531f0309aa43c7002386b35e73742f063a3.tar.bz2
scala-7418d531f0309aa43c7002386b35e73742f063a3.zip
Fix for stability failure, I think. No review.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
index b2dc217708..dc8cd7b78a 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
@@ -1727,11 +1727,12 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid {
////////////////////// Utilities ////////////////////////
private val javaNameCache = mutable.HashMap[Symbol, String]()
- override def javaName(sym: Symbol): String = javaNameCache.getOrElseUpdate(sym, {
+ override def javaName(sym: Symbol): String = {
if (sym.isClass && !sym.rawowner.isPackageClass && !sym.isModuleClass)
innerClasses = innerClasses + sym
- super.javaName(sym)
- })
+
+ javaNameCache.getOrElseUpdate(sym, super.javaName(sym))
+ }
private val javaTypeCache = mutable.HashMap[Symbol, JType]()
override def javaType(sym: Symbol): JType = javaTypeCache.getOrElseUpdate(sym, super.javaType(sym))