From 364f281384d70f9f4aa9be3cd292c61d31fd07e9 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Fri, 6 May 2016 18:36:47 +0300
Subject: [PATCH] IDEA-131748 Stop debug session kills all processes - read
 taskkill output and log in case of error

---
 .../execution/process/WinProcessManager.java  | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/platform/util/src/com/intellij/execution/process/WinProcessManager.java b/platform/util/src/com/intellij/execution/process/WinProcessManager.java
index 609dc150792d..8df128194672 100644
--- a/platform/util/src/com/intellij/execution/process/WinProcessManager.java
+++ b/platform/util/src/com/intellij/execution/process/WinProcessManager.java
@@ -16,6 +16,8 @@
 package com.intellij.execution.process;
 
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ReflectionUtil;
 import com.sun.jna.Pointer;
 import com.sun.jna.platform.win32.Kernel32;
@@ -60,9 +62,21 @@ public class WinProcessManager {
   public static boolean kill(Process process, boolean tree) {
     try {
       int pid = getProcessPid(process);
-      String command = "taskkill /PID " + pid + (tree ? " /t" : "") + " /f";
-      LOG.debug(command);
-      Runtime.getRuntime().exec(command).waitFor();
+      String[] cmdArray = {"taskkill", "/f", "/pid", String.valueOf(pid), tree ? "/t" : ""};
+      if (LOG.isDebugEnabled()) {
+        LOG.debug(StringUtil.join(cmdArray, " "));
+      }
+      Process p = new ProcessBuilder(cmdArray).redirectErrorStream(true).start();
+      String output = FileUtil.loadTextAndClose(p.getInputStream());
+      int res = p.waitFor();
+      if (res != 0) {
+        LOG.warn(StringUtil.join(cmdArray, " ") + " failed: " + output);
+        return false;
+      }
+      else if (LOG.isDebugEnabled()) {
+        LOG.debug(output);
+      }
+
       return true;
     }
     catch (Exception e) {