From ce666295f7858a5b21e923fddb480e9eb8b2c5f5 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Thu, 28 Mar 2019 16:39:46 +0300
Subject: [PATCH] New J2K: Fix npe when converting java member without parent

---
 .../jetbrains/kotlin/nj2k/conversions/ModalityConversion.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ModalityConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ModalityConversion.kt
index 55e2ef0a022..666fbc11917 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ModalityConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ModalityConversion.kt
@@ -36,8 +36,8 @@ class ModalityConversion(private val context: ConversionContext) : RecursiveAppl
     }
 
     private fun processMethod(method: JKJavaMethod) {
-        val psi = method.psi<PsiMethod>()!!
-        val containingClass = method.parentOfType<JKClass>()!!
+        val psi = method.psi<PsiMethod>() ?: return
+        val containingClass = method.parentOfType<JKClass>() ?: return
         method.modality = when {
             method.modality != Modality.ABSTRACT
                     && psi.findSuperMethods().isNotEmpty() -> Modality.OVERRIDE
@@ -54,7 +54,7 @@ class ModalityConversion(private val context: ConversionContext) : RecursiveAppl
     }
 
     private fun processField(field: JKField) {
-        val containingClass = field.parentOfType<JKClass>()!!
+        val containingClass = field.parentOfType<JKClass>() ?: return
         if (containingClass.classKind == JKClass.ClassKind.INTERFACE) {
             field.modality = Modality.FINAL
         }