From 0b41136c7cfc7414076d890e4e510d69430ff5ae Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Fri, 6 Feb 2015 15:37:27 +0300
Subject: [PATCH] Minor. Logic clarified

---
 .../jetbrains/kotlin/load/kotlin/KotlinJvmCheckerProvider.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmCheckerProvider.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmCheckerProvider.kt
index 69a62be9fce..6d932e958d4 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmCheckerProvider.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmCheckerProvider.kt
@@ -173,8 +173,9 @@ public class JavaNullabilityWarningsChecker : AdditionalTypeChecker {
         if (TypeUtils.noExpectedType(expectedType)) return
 
         val expectedMustNotBeNull = expectedType.mustNotBeNull()
-        val actualNullabilityInKotlin = dataFlowInfo.getNullability(dataFlowValue)
-        val actualMayBeNull = if (actualNullabilityInKotlin == Nullability.NOT_NULL) null else expressionType.mayBeNull()
+        if (dataFlowInfo.getNullability(dataFlowValue) == Nullability.NOT_NULL) return
+
+        val actualMayBeNull = expressionType.mayBeNull()
 
         if (expectedMustNotBeNull == NullabilityInformationSource.KOTLIN && actualMayBeNull == NullabilityInformationSource.KOTLIN) {
             // a type mismatch error will be reported elsewhere