From e5cb56662e6aa7339b6474ee63ddf8acc0bb9547 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 12 Nov 2015 17:13:26 +0100 Subject: [PATCH] Disabling parallel builds without daemon again and undoing apprpriate fix to broken tests problem, since it effectively cancelled fix for parallel building itself and was causing exceptions on heavy builds (cherry picked from commit 0610452) Original commit: 4643d7fc4d91979370b06abbf5a5d4a5873a9f77 --- .../org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java index 6f93cb03680..cc97d0376f3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java @@ -70,7 +70,7 @@ public class CompilerRunnerUtil { } @Nullable - public static Object invokeExecMethod( + public synchronized static Object invokeExecMethod( @NotNull String compilerClassName, @NotNull String[] arguments, @NotNull CompilerEnvironment environment,