From 27ea2dc6f912c317ba357519ae4684df7f90801c Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 16 Feb 2016 16:14:17 +0300 Subject: [PATCH] Change Signature: Fix EA-77624 --- .../changeSignature/KotlinChangeSignatureUsageProcessor.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt index 309abdabe12..00b92692546 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt @@ -815,10 +815,8 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { val isJavaMethodUsage = isJavaMethodUsage(usageInfo) if (usageInfo is KotlinWrapperForJavaUsageInfos) { - val javaChangeInfos = (changeInfo as KotlinChangeInfo).getOrCreateJavaChangeInfos() - assert(javaChangeInfos != null) { "JavaChangeInfo not found: " + method.text } - - javaChangeInfos!!.firstOrNull { + val javaChangeInfos = (changeInfo as KotlinChangeInfo).getOrCreateJavaChangeInfos() ?: return true + javaChangeInfos.firstOrNull { changeInfo.originalToCurrentMethods[usageInfo.javaChangeInfo.method] == it.method }?.let { javaChangeInfo -> val nullabilityPropagator = NullabilityPropagator(javaChangeInfo.method)