diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ArrayInitializerConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ArrayInitializerConversion.kt index a0ec0f6b2fd..43cbf078424 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ArrayInitializerConversion.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ArrayInitializerConversion.kt @@ -44,7 +44,7 @@ class ArrayInitializerConversion(private val context: ConversionContext) : Recur JKJavaMethodCallExpressionImpl( context.symbolProvider.provideByFqName("kotlin/arrayOfNulls"), JKArgumentListImpl(dimensions[0]), - JKTypeArgumentListImpl(listOf(JKTypeElementImpl(type.updateNullability(Nullability.NotNull)))) + JKTypeArgumentListImpl(listOf(JKTypeElementImpl(type))) ) } else { JKJavaNewExpressionImpl( @@ -75,7 +75,7 @@ class ArrayInitializerConversion(private val context: ConversionContext) : Recur resultType = JKClassTypeImpl( context.symbolProvider.provideByFqName(KotlinBuiltIns.FQ_NAMES.array.asString()), listOf(resultType), - Nullability.NotNull + Nullability.Default ) } return JKJavaMethodCallExpressionImpl( diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/TypeMappingConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/TypeMappingConversion.kt index a21392cff6f..77b94a0e80e 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/TypeMappingConversion.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/TypeMappingConversion.kt @@ -107,7 +107,7 @@ class TypeMappingConversion(val context: ConversionContext) : RecursiveApplicabl JKClassTypeImpl( context.symbolProvider.provideByFqName(type.arrayFqName()), if (type is JKJavaPrimitiveType) emptyList() else listOf(type.mapType(typeElement)), - type.nullability + nullability ) else -> this }