From 4145f431a087c1854b6b1440e2b7abe5aab3d9b4 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 20 Aug 2015 17:36:26 +0200 Subject: [PATCH] Fixes after review Original commit: 61de1c3212715e67b3c5314edabf6352ec30f78f --- .../kotlin/compilerRunner/KotlinCompilerRunner.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index 25b917c6b6e..658343708d3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -62,7 +62,8 @@ public class KotlinCompilerRunner { CompilerSettings compilerSettings, MessageCollector messageCollector, CompilerEnvironment environment, - Map incrementalCaches, File moduleFile, + Map incrementalCaches, + File moduleFile, OutputItemsCollector collector ) { K2JVMCompilerArguments arguments = mergeBeans(commonArguments, k2jvmArguments); @@ -78,7 +79,8 @@ public class KotlinCompilerRunner { @NotNull CompilerSettings compilerSettings, @NotNull MessageCollector messageCollector, @NotNull CompilerEnvironment environment, - Map incrementalCaches, @NotNull OutputItemsCollector collector, + Map incrementalCaches, + @NotNull OutputItemsCollector collector, @NotNull Collection sourceFiles, @NotNull List libraryFiles, @NotNull File outputFile @@ -156,7 +158,6 @@ public class KotlinCompilerRunner { // exec() returns an ExitCode object, class of which is loaded with a different class loader, // so we take it's contents through reflection return getReturnCodeFromObject(rc); - } catch (Throwable e) { MessageCollectorUtil.reportException(messageCollector, e);