SONAR-3318 Fix handling of exceptions in CommandExecutor

1 files changed, 2 insertions, 0 deletions

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 8ec3bf2cb66..214674029c3 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
@@ -80,6 +80,8 @@ public final class CommandExecutor {
       executorService = Executors.newSingleThreadExecutor();
       Future<Integer> ft = executorService.submit(call);
       int exitCode = ft.get(timeoutMilliseconds, TimeUnit.MILLISECONDS);
+      waitUntilFinish(outputGobbler);
+      waitUntilFinish(errorGobbler);
       if (outputGobbler.getException() != null) {
         throw new CommandException(command, "Error inside stdOut parser", outputGobbler.getException());
       }