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

Avoid NPE at UtilKt.toJavaClass for unrecognized classes

Browse Source 
Sadly, the case where this NPE would reproduce, remains unknown

 #KT-18494 Fixed
This commit is contained in:
Alexander Udalov
2017-06-20 12:04:51 +03:00
parent 8ef3531c48
commit 31b2fffbe1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt
+2 -2
View File
@@ -53,9 +53,9 @@ internal fun ClassDescriptor.toJavaClass(): Class<*>? {
(source.javaElement as ReflectJavaClass).element (source.javaElement as ReflectJavaClass).element
} }
else -> { else -> {
// If this is neither a Kotlin class nor a Java class, it is either a built-in or some fake class descriptor like the one // If this is neither a Kotlin class nor a Java class, it's likely either a built-in or some fake class descriptor like the one
// that's created for java.io.Serializable in JvmBuiltInsSettings // that's created for java.io.Serializable in JvmBuiltInsSettings
val classId = JavaToKotlinClassMap.mapKotlinToJava(DescriptorUtils.getFqName(this)) ?: classId!! val classId = JavaToKotlinClassMap.mapKotlinToJava(DescriptorUtils.getFqName(this)) ?: classId ?: return null
val packageName = classId.packageFqName.asString() val packageName = classId.packageFqName.asString()
val className = classId.relativeClassName.asString() val className = classId.relativeClassName.asString()
// All pseudo-classes like kotlin.String.Companion must be accessible from the current class loader // All pseudo-classes like kotlin.String.Companion must be accessible from the current class loader