azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix HashMap.containsAll for some corner cases. (#2723)

Browse Source
This commit is contained in:
Nikolay Igotti
2019-02-26 18:37:36 +03:00
committed by GitHub
parent 55fc1345cb
commit 3a70c3b41b
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main/kotlin/kotlin/collections/HashMap.kt
+4 -6
View File
@@ -386,15 +386,15 @@ actual class HashMap<K, V> private constructor(
private fun contentEquals(other: Map<*, *>): Boolean = _size == other.size && containsAllEntries(other.entries) private fun contentEquals(other: Map<*, *>): Boolean = _size == other.size && containsAllEntries(other.entries)
internal fun containsAllEntries(m: Collection<Map.Entry<*, *>>): Boolean { internal fun containsAllEntries(m: Collection<*>): Boolean {
val it = m.iterator() val it = m.iterator()
while (it.hasNext()) { while (it.hasNext()) {
val entry = it.next() val entry = it.next()
try { try {
@Suppress("UNCHECKED_CAST") // todo: get rid of unchecked cast here somehow @Suppress("UNCHECKED_CAST") // todo: get rid of unchecked cast here somehow
if (!containsEntry(entry as Map.Entry<K, V>)) if (entry == null || !containsEntry(entry as Map.Entry<K, V>))
return false return false
} catch(e: ClassCastException) { } catch (e: ClassCastException) {
return false return false
} }
} }
@@ -676,9 +676,7 @@ internal class HashMapEntrySet<K, V> internal constructor(
override fun retainAll(elements: Collection<MutableMap.MutableEntry<K, V>>): Boolean = backing.retainAllEntries(elements) override fun retainAll(elements: Collection<MutableMap.MutableEntry<K, V>>): Boolean = backing.retainAllEntries(elements)
override fun equals(other: Any?): Boolean = override fun equals(other: Any?): Boolean =
other === this || other === this || other is Set<*> && contentEquals(other)
other is Set<*> &&
contentEquals(other)
override fun hashCode(): Int { override fun hashCode(): Int {
var result = 0 var result = 0