diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-06-01 10:10:33 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-06-01 10:10:33 +0200 |
| commit | 460fa9d2af7ac12d5c6b0b935a02db30dc5d7cd8 (patch) | |
| tree | 691928c7536f0835e0cc954103a272bb987add76 /src/library/scala/collection/immutable/HashMap.scala | |
| parent | 8e48655fb60c956d50282f12c702c1d0533ed24b (diff) | |
| parent | 41965695b71bc00ea60003c39c72a0e10bfd621f (diff) | |
| download | scala-460fa9d2af7ac12d5c6b0b935a02db30dc5d7cd8.tar.gz scala-460fa9d2af7ac12d5c6b0b935a02db30dc5d7cd8.tar.bz2 scala-460fa9d2af7ac12d5c6b0b935a02db30dc5d7cd8.zip | |
Merge commit '4196569' into merge-2.11-to-2.12-june-1
Diffstat (limited to 'src/library/scala/collection/immutable/HashMap.scala')
| -rw-r--r-- | src/library/scala/collection/immutable/HashMap.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/collection/immutable/HashMap.scala b/src/library/scala/collection/immutable/HashMap.scala index eac9c14f3f..6b29b084aa 100644 --- a/src/library/scala/collection/immutable/HashMap.scala +++ b/src/library/scala/collection/immutable/HashMap.scala @@ -201,7 +201,7 @@ object HashMap extends ImmutableMapFactory[HashMap] with BitOperations.Int { if (this.value.asInstanceOf[AnyRef] eq value.asInstanceOf[AnyRef]) this else new HashMap1(key, hash, value, kv) } else { - val nkv = merger(this.kv, kv) + val nkv = merger(this.ensurePair, if(kv != null) kv else (key, value)) new HashMap1(nkv._1, hash, nkv._2, nkv) } } else { |