Merge pull request #890 from qoomon/master

fix: handle isValue exceptions
mockk · Aug 24, 2022 · 0e9e346 · 0e9e346
2 parents 35e4dea + 95b3858
commit 0e9e346
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/modules/mockk-agent-android/src/main/kotlin/io/mockk/ValueClassSupportAndroid.kt b/modules/mockk-agent-android/src/main/kotlin/io/mockk/ValueClassSupportAndroid.kt
@@ -3,6 +3,7 @@ package io.mockk
 import kotlin.reflect.KClass
 import kotlin.reflect.KProperty1
 import kotlin.reflect.full.declaredMemberProperties
+import kotlin.reflect.jvm.internal.KotlinReflectionInternalError
 import kotlin.reflect.jvm.isAccessible
 import kotlin.reflect.jvm.javaField
 
@@ -62,4 +63,6 @@ private val <T : Any> KClass<T>.isValue_safe: Boolean
         this.isValue
     } catch (_: UnsupportedOperationException) {
         false
+    } catch (_: KotlinReflectionInternalError) {
+        false
     }
diff --git a/modules/mockk-agent/src/jvmMain/kotlin/io/mockk/ValueClassSupport.kt b/modules/mockk-agent/src/jvmMain/kotlin/io/mockk/ValueClassSupport.kt
@@ -3,6 +3,7 @@ package io.mockk
 import kotlin.reflect.KClass
 import kotlin.reflect.KProperty1
 import kotlin.reflect.full.declaredMemberProperties
+import kotlin.reflect.jvm.internal.KotlinReflectionInternalError
 import kotlin.reflect.jvm.isAccessible
 import kotlin.reflect.jvm.javaField
 
@@ -62,4 +63,6 @@ private val <T : Any> KClass<T>.isValue_safe: Boolean
         this.isValue
     } catch (_: UnsupportedOperationException) {
         false
+    } catch (_: KotlinReflectionInternalError) {
+        false
     }