From fe5d5abd886212dab0b6862045efa7f46305419e Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Thu, 3 Oct 2013 16:01:46 +0200 Subject: [PATCH] myShouldKillProcessSoftly --- .../com/jetbrains/python/debugger/PyDebugProcess.java | 4 ++-- .../jetbrains/python/run/PythonProcessHandler.java | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java index 6c197885bac5..6c115aa311f1 100644 --- a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java +++ b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java @@ -635,8 +635,8 @@ public class PyDebugProcess extends XDebugProcess implements IPyDebugProcess, Pr private void setKillingStrategy() { if (myProcessHandler instanceof PythonProcessHandler) { - ((PythonProcessHandler)myProcessHandler) - .setShouldTryToKillSoftly(false); //while process is suspended it can't terminate softly, + ((PythonProcessHandler)myProcessHandler).setShouldKillProcessSoftly(false); + //while process is suspended it can't terminate softly, //multiple processes in debug mode also can not terminate properly //so its better to kill all the tree in a hard way } diff --git a/python/src/com/jetbrains/python/run/PythonProcessHandler.java b/python/src/com/jetbrains/python/run/PythonProcessHandler.java index f401cd0da78e..6cf187b33e0a 100644 --- a/python/src/com/jetbrains/python/run/PythonProcessHandler.java +++ b/python/src/com/jetbrains/python/run/PythonProcessHandler.java @@ -11,8 +11,6 @@ import java.nio.charset.Charset; * @author traff */ public class PythonProcessHandler extends KillableColoredProcessHandler { - private boolean myShouldTryToKillSoftly = true; - protected PythonProcessHandler(@NotNull Process process, @NotNull GeneralCommandLine commandLine) { super(process, commandLine.getCommandLineString()); } @@ -21,15 +19,6 @@ public class PythonProcessHandler extends KillableColoredProcessHandler { super(process, commandLine, charset); } - public void setShouldTryToKillSoftly(boolean shouldTryToKillSoftly) { - myShouldTryToKillSoftly = shouldTryToKillSoftly; - } - - @Override - protected boolean shouldKillProcessSoftly() { - return myShouldTryToKillSoftly; - } - @Override protected boolean shouldDestroyProcessRecursively() { return true;