azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disposal on error when processing module script.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-02-12 01:50:30 +04:00
parent b9e5704057
commit f55c3befb3
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
+12 -9
View File
@@ -99,17 +99,20 @@ public class CompileEnvironmentUtil {
configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, moduleScriptFile); configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, moduleScriptFile);
configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector); configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector);
JetCoreEnvironment scriptEnvironment = new JetCoreEnvironment(disposable, configuration); List<Module> modules;
try {
JetCoreEnvironment scriptEnvironment = new JetCoreEnvironment(disposable, configuration);
GenerationState generationState = KotlinToJVMBytecodeCompiler.analyzeAndGenerate(scriptEnvironment, false);
if (generationState == null) {
throw new CompileEnvironmentException("Module script " + moduleScriptFile + " analyze failed:\n" +
loadModuleScriptText(moduleScriptFile));
}
GenerationState generationState = KotlinToJVMBytecodeCompiler.analyzeAndGenerate(scriptEnvironment, false); modules = runDefineModules(paths, moduleScriptFile, generationState.getFactory());
if (generationState == null) { }
throw new CompileEnvironmentException("Module script " + moduleScriptFile + " analyze failed:\n" + finally {
loadModuleScriptText(moduleScriptFile)); Disposer.dispose(disposable);
} }
List<Module> modules = runDefineModules(paths, moduleScriptFile, generationState.getFactory());
Disposer.dispose(disposable);
if (modules == null) { if (modules == null) {
throw new CompileEnvironmentException("Module script " + moduleScriptFile + " compilation failed"); throw new CompileEnvironmentException("Module script " + moduleScriptFile + " compilation failed");