From eacd50c4dc3684f9e99eacfff56cf5dc0ec888f8 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 9 Feb 2016 15:08:26 +0300 Subject: [PATCH] FIx possible NPEs when try to use TestModuleProperties in IDEA 144.x #EA-78931 Fixed --- .../jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt | 5 +++-- .../kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt index bf2a1513bc0..34080d638d9 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt @@ -60,8 +60,9 @@ private val getRelatedProductionModule: (Module) -> Module? = run { } return@run { module -> - val instance = getInstanceMethod(null, module) - getProductionModuleMethod(instance) as Module? + getInstanceMethod(null, module)?.let { + getProductionModuleMethod(it) as Module? + } } } diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt index a87bb0a6f92..e4089a34907 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt @@ -63,8 +63,9 @@ object KotlinBuilderModuleScriptGenerator { } return@run { module -> - val instance = getTestModulePropertiesMethod(JpsJavaExtensionService.getInstance(), module) - getProductionModuleMethod(instance) as JpsModule? + getTestModulePropertiesMethod(JpsJavaExtensionService.getInstance(), module)?.let { + getProductionModuleMethod(it) as JpsModule? + } } }