From ba8c35ce23764eea928e3437477eaf383c00c26f 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 Original commit: eacd50c4dc3684f9e99eacfff56cf5dc0ec888f8 --- .../kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt index a87bb0a6f92..e4089a34907 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt +++ b/jps/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? + } } }