Merge 46f0a47 into fae19fa

JetBrains · Jun 12, 2023 · 6174fc5 · 6174fc5
2 parents fae19fa + 46f0a47
commit 6174fc5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/paging/paging-common/src/main/kotlin/androidx/paging/CombinedLoadStates.kt b/paging/paging-common/src/main/kotlin/androidx/paging/CombinedLoadStates.kt
@@ -70,7 +70,7 @@ public class CombinedLoadStates(
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (javaClass != other?.javaClass) return false
+        if (other == null || this::class != other::class) return false
 
         other as CombinedLoadStates
 

diff --git a/paging/paging-common/src/main/kotlin/androidx/paging/TransformablePage.kt b/paging/paging-common/src/main/kotlin/androidx/paging/TransformablePage.kt
@@ -91,7 +91,7 @@ internal data class TransformablePage<T : Any>(
     // for IntArray.
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (javaClass != other?.javaClass) return false
+        if (other == null || this::class != other::class) return false
 
         other as TransformablePage<*>