szeiger
diff --git a/‎collections/src/main/scala/strawman/collection/mutable/HashMap.scala
Lines changed: 7 additions & 4 deletions b/‎collections/src/main/scala/strawman/collection/mutable/HashMap.scala
Lines changed: 7 additions & 4 deletions
diff --git a/‎collections/src/main/scala/strawman/collection/mutable/HashTable.scala
Lines changed: 0 additions & 7 deletions b/‎collections/src/main/scala/strawman/collection/mutable/HashTable.scala
Lines changed: 0 additions & 7 deletions
diff --git a/‎test/junit/src/test/scala/strawman/collection/mutable/HashMapTest.scala
Lines changed: 14 additions & 0 deletions b/‎test/junit/src/test/scala/strawman/collection/mutable/HashMapTest.scala
Lines changed: 14 additions & 0 deletions
@@ -80,17 +80,20 @@ class HashMap[K, V] private[collection] (contents: HashTable.Contents[K, Default
   override def getOrElseUpdate(key: K, defaultValue: => V): V = {
     val hash = table.elemHashCode(key)
     val i = table.index(hash)
-    val entry = table.findEntry0(key, i)
-    if (entry != null) entry.value
+    val firstEntry = table.findEntry0(key, i)
+    if (firstEntry != null) firstEntry.value
     else {
       val table0 = table.table
       val default = defaultValue
       // Avoid recomputing index if the `defaultValue()` hasn't triggered
       // a table resize.
       val newEntryIndex = if (table0 eq table.table) i else table.index(hash)
       val e = table.createNewEntry(key, default)
-      if (table.tableSize >= table.threshold) table.addEntry(e)
-      else table.addEntry2(e, newEntryIndex)
+      // Repeat search
+      // because evaluation of `default` can bring entry with `key`
+      val secondEntry = table.findEntry0(key, newEntryIndex)
+      if (secondEntry == null) table.addEntry0(e, newEntryIndex)
+      else secondEntry.value = default
       default
     }
   }
 
@@ -158,13 +158,6 @@ private[mutable] abstract class HashTable[A, B, Entry >: Null <: HashEntry[A, En
       resize(2 * table.length)
   }
 
-  protected[collection] def addEntry2(e: Entry, h: Int): Unit = {
-    e.next = table(h).asInstanceOf[Entry]
-    table(h) = e
-    tableSize += 1
-    nnSizeMapAdd(h)
-  }
-
   /** Find entry with given key in table, or add new one if not found.
    *  May be somewhat faster then `findEntry`/`addEntry` pair as it
    *  computes entry's hash index only once.
 
@@ -5,6 +5,7 @@ import org.junit.Assert._
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import strawman.collection.immutable.List
 
 @RunWith(classOf[JUnit4])
 class HashMapTest {
@@ -35,4 +36,17 @@ class HashMapTest {
     hm.put(0, 0)
     hm.getOrElseUpdate(0, throw new AssertionError())
   }
+
+  @Test
+  def getOrElseUpdate_keyIdempotence(): Unit = {
+    val map = mutable.HashMap[String, String]()
+
+    val key = "key"
+    map.getOrElseUpdate(key, {
+      map.getOrElseUpdate(key, "value1")
+      "value2"
+    })
+
+    assertEquals(List((key, "value2")), map.toList)
+  }
 }