From 839413930bf77c26143d072a2096a0dc796d4a17 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Thu, 14 Jun 2012 19:38:03 +0400 Subject: [PATCH] better than NPE --- .../jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java index 85ee2f079b3..f6fd0c13567 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java @@ -131,6 +131,7 @@ public class CompileEnvironmentUtil { return null; } + @NotNull public static List loadModuleScript(String moduleScriptFile, MessageCollector messageCollector) { Disposable disposable = new Disposable() { @Override @@ -145,7 +146,7 @@ public class CompileEnvironmentUtil { GenerationState generationState = KotlinToJVMBytecodeCompiler .analyzeAndGenerate(new K2JVMCompileEnvironmentConfiguration(scriptEnvironment, messageCollector, false), false); if (generationState == null) { - return null; + throw new CompileEnvironmentException("Module script " + moduleScriptFile + " analyze failed"); } List modules = runDefineModules(dependencies, moduleScriptFile, generationState.getFactory());