From 0c17bbe1c4dad4d87b122a795b57ec83cadd15e5 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Thu, 12 Jun 2014 01:38:26 +0400 Subject: [PATCH] Minor: fix warnings --- eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt b/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt index af6d60070b2..6ca3861c850 100644 --- a/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt +++ b/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt @@ -66,7 +66,7 @@ class JDIEval( ) } - override fun loadString(str: String): Value = vm.mirrorOf(str)!!.asValue() + override fun loadString(str: String): Value = vm.mirrorOf(str).asValue() override fun newInstance(classType: Type): Value { return NewObjectValue(classType) @@ -253,12 +253,7 @@ class JDIEval( val dimensions = name.count { it == '[' } val baseTypeName = if (dimensions > 0) name.substring(0, name.indexOf('[')) else name - val primitiveType = primitiveTypes[baseTypeName] - val baseType = if (primitiveType != null) - primitiveType - else { - Type.getType("L$baseTypeName;").asReferenceType() - } + val baseType = primitiveTypes[baseTypeName] ?: Type.getType("L$baseTypeName;").asReferenceType() if (dimensions == 0) baseType