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

Do not fail with type cast when not needed in reflection.jvm

Browse Source
This commit is contained in:
Alexander Udalov
2015-11-06 00:46:57 +03:00
parent 1c889c4e67
commit 7d32524754
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/reflection.jvm/src/kotlin/reflect/jvm/KCallablesJvm.kt
+2 -2
View File
@@ -53,7 +53,7 @@ public var KCallable<*>.isAccessible: Boolean
javaMethod?.isAccessible ?: true javaMethod?.isAccessible ?: true
is KFunction -> is KFunction ->
javaMethod?.isAccessible ?: true && javaMethod?.isAccessible ?: true &&
((this as KCallableImpl<*>).defaultCaller?.member as? AccessibleObject)?.isAccessible ?: true && ((this as? KCallableImpl<*>)?.defaultCaller?.member as? AccessibleObject)?.isAccessible ?: true &&
this.javaConstructor?.isAccessible ?: true this.javaConstructor?.isAccessible ?: true
else -> throw UnsupportedOperationException("Unknown callable: $this ($javaClass)") else -> throw UnsupportedOperationException("Unknown callable: $this ($javaClass)")
} }
@@ -79,7 +79,7 @@ public var KCallable<*>.isAccessible: Boolean
} }
is KFunction -> { is KFunction -> {
javaMethod?.isAccessible = value javaMethod?.isAccessible = value
((this as KCallableImpl<*>).defaultCaller?.member as? AccessibleObject)?.isAccessible = true ((this as? KCallableImpl<*>)?.defaultCaller?.member as? AccessibleObject)?.isAccessible = true
this.javaConstructor?.isAccessible = value this.javaConstructor?.isAccessible = value
} }
else -> throw UnsupportedOperationException("Unknown callable: $this ($javaClass)") else -> throw UnsupportedOperationException("Unknown callable: $this ($javaClass)")
core/reflection.jvm/src/kotlin/reflect/jvm/ReflectJvmMapping.kt
+1 -1
View File
@@ -33,7 +33,7 @@ import kotlin.reflect.jvm.internal.KTypeImpl
* or `null` if the property has no backing field. * or `null` if the property has no backing field.
*/ */
public val KProperty<*>.javaField: Field? public val KProperty<*>.javaField: Field?
get() = (this as KPropertyImpl<*>).javaField get() = (this as? KPropertyImpl<*>)?.javaField
/** /**
* Returns a Java [Method] instance corresponding to the getter of the given property, * Returns a Java [Method] instance corresponding to the getter of the given property,