From 279c835d04098348b1e15f83964d396f382cded1 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Wed, 13 Jun 2018 19:43:13 +0300
Subject: [PATCH] New J2K: Fix nullability for converted primitive types

---
 .../kotlin/j2k/conversions/TypeMappingConversion.kt    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
index 8ea39584feb..44b2caa3025 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
@@ -59,7 +59,13 @@ class TypeMappingConversion(val context: ConversionContext) : RecursiveApplicabl
     private fun mapPrimitiveType(type: JKJavaPrimitiveType, typeElement: JKTypeElement): JKTypeElement {
         val fqName = type.jvmPrimitiveType.primitiveType.typeFqName
 
-        return classTypeByFqName(context.backAnnotator(typeElement), ClassId.topLevel(fqName), emptyList())?.let { JKTypeElementImpl(it) }
-                ?: typeElement
+        val convertedType = classTypeByFqName(
+            context.backAnnotator(typeElement),
+            ClassId.topLevel(fqName),
+            emptyList(),
+            nullability = Nullability.NotNull
+        ) ?: return typeElement
+
+        return JKTypeElementImpl(convertedType)
     }
 }
\ No newline at end of file