From fd60ec417144e64f5f697fb92861a10ee34bb15e Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 25 May 2016 16:14:51 +0300 Subject: [PATCH] Set idea.io.use.nio2=true every build on windows Otherwise (setting property once in static block) gradle daemon might clear system properties #KT-11770 fixed --- .../cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java index f5dece48d25..9b302fd352a 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java @@ -49,7 +49,7 @@ import java.util.Properties; import static org.jetbrains.kotlin.cli.common.ExitCode.*; public abstract class CLICompiler { - static { + static private void setIdeaIoUseFallback() { if (SystemInfo.isWindows) { Properties properties = System.getProperties(); @@ -202,6 +202,7 @@ public abstract class CLICompiler { } Disposable rootDisposable = Disposer.newDisposable(); try { + setIdeaIoUseFallback(); ExitCode code = doExecute(arguments, configuration, rootDisposable); exitCode = groupingCollector.hasErrors() ? COMPILATION_ERROR : code; }