From 1cb5ffd92e0581d4d8c0ff0555a2e1171febe5de Mon Sep 17 00:00:00 2001 From: Sergey Simonchik Date: Sat, 8 Oct 2016 13:30:59 +0300 Subject: [PATCH] util: add the final modifier to myMediatedProcess --- .../execution/process/KillableColoredProcessHandler.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/execution/process/KillableColoredProcessHandler.java b/platform/platform-impl/src/com/intellij/execution/process/KillableColoredProcessHandler.java index a7b7c0c8dd36..99ce8de3cff2 100644 --- a/platform/platform-impl/src/com/intellij/execution/process/KillableColoredProcessHandler.java +++ b/platform/platform-impl/src/com/intellij/execution/process/KillableColoredProcessHandler.java @@ -39,10 +39,10 @@ public class KillableColoredProcessHandler extends ColoredProcessHandler impleme private static final Key MEDIATOR_KEY = Key.create("KillableColoredProcessHandler.Mediator.Process"); private boolean myShouldKillProcessSoftly = true; - private boolean myMediatedProcess = false; + private final boolean myMediatedProcess; public KillableColoredProcessHandler(@NotNull GeneralCommandLine commandLine) throws ExecutionException { - super(commandLine); + this(commandLine, false); } /** @@ -58,6 +58,7 @@ public class KillableColoredProcessHandler extends ColoredProcessHandler impleme */ public KillableColoredProcessHandler(@NotNull Process process, /*@NotNull*/ String commandLine) { super(process, commandLine); + myMediatedProcess = false; } /** @@ -65,9 +66,11 @@ public class KillableColoredProcessHandler extends ColoredProcessHandler impleme */ public KillableColoredProcessHandler(@NotNull Process process, /*@NotNull*/ String commandLine, @NotNull Charset charset) { super(process, commandLine, charset); + myMediatedProcess = false; } - private static GeneralCommandLine mediate(GeneralCommandLine commandLine, boolean withMediator) { + @NotNull + private static GeneralCommandLine mediate(@NotNull GeneralCommandLine commandLine, boolean withMediator) { if (withMediator && SystemInfo.isWindows) { boolean mediatorInjected = RunnerMediator.injectRunnerCommand(commandLine); MEDIATOR_KEY.set(commandLine, mediatorInjected); -- 2.32.0