1 files changed, 27 insertions, 21 deletions
diff --git a/src/compiler/scala/reflect/runtime/ConversionUtil.scala b/src/compiler/scala/reflect/runtime/ConversionUtil.scala
index bd40200310..e75fd78590 100644
--- a/src/compiler/scala/reflect/runtime/ConversionUtil.scala
+++ b/src/compiler/scala/reflect/runtime/ConversionUtil.scala
@@ -17,36 +17,42 @@ trait ConversionUtil { self: SymbolTable =>
     private val toScalaMap = new HashMap[J, S]
     private val toJavaMap = new HashMap[S, J]
 
-    def enter(j: J, s: S) = {
+    def enter(j: J, s: S) = synchronized {
       debugInfo("cached: "+j+"/"+s)
       toScalaMap(j) = s
       toJavaMap(s) = j
     }
 
-    def toScala(key: J)(body: => S): S = toScalaMap get key match {
-      case Some(v) =>
-        v
-      case none =>
-        val result = body
-        enter(key, result)
-        result
+    def toScala(key: J)(body: => S): S = synchronized { 
+      toScalaMap get key match {
+        case Some(v) =>
+          v
+        case none =>
+          val result = body
+          enter(key, result)
+          result
+      }
     }
 
-    def toJava(key: S)(body: => J): J = toJavaMap get key match {
-      case Some(v) =>
-        v
-      case none =>
-        val result = body
-        enter(result, key)
-        result
+    def toJava(key: S)(body: => J): J = synchronized { 
+      toJavaMap get key match {
+        case Some(v) =>
+          v
+        case none =>
+          val result = body
+          enter(result, key)
+          result
+      }
     }
 
-    def toJavaOption(key: S)(body: => Option[J]): Option[J] = toJavaMap get key match {
-      case None =>
-        val result = body
-        for (value <- result) enter(value, key)
-        result
-      case some => some
+    def toJavaOption(key: S)(body: => Option[J]): Option[J] = synchronized {
+      toJavaMap get key match {
+        case None =>
+          val result = body
+          for (value <- result) enter(value, key)
+          result
+        case some => some
+      }
     }
   }