From 8cfd8984b7404bb1ded935ae6f46d7ce0faee405 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Fri, 27 Mar 2015 16:18:44 +0100
Subject: Fix quality flaw

---
 .../src/main/java/org/sonar/api/utils/command/CommandExecutor.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sonar-plugin-api/src/main/java')

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/command/CommandExecutor.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/command/CommandExecutor.java
index e395c8ab820..0a094de7052 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/command/CommandExecutor.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/command/CommandExecutor.java
@@ -101,7 +101,6 @@ public class CommandExecutor {
       return exitCode;
 
     } catch (java.util.concurrent.TimeoutException te) {
-      process.destroy();
       throw new TimeoutException(command, "Timeout exceeded: " + timeoutMilliseconds + " ms", te);
 
     } catch (CommandException e) {
@@ -111,6 +110,9 @@ public class CommandExecutor {
       throw new CommandException(command, e);
 
     } finally {
+      if (process != null) {
+        process.destroy();
+      }
       waitUntilFinish(outputGobbler);
       waitUntilFinish(errorGobbler);
       closeStreams(process);
-- 
cgit v1.2.3