Refs #6488 Fix deadlock while waiting for command. (#37)

eProsima · Oct 1, 2019 · 22a6577 · 22a6577
1 parent 8318f05
commit 22a6577
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/src/it/java/com/eprosima/integration/Command.java b/src/it/java/com/eprosima/integration/Command.java
@@ -6,6 +6,7 @@
 import java.io.InputStreamReader;
 import java.util.Arrays;
 import java.util.List;
+import java.util.ArrayList;
 
 public class Command
 {
@@ -22,15 +23,23 @@ public static boolean execute(String command, String from, boolean errorOutputOn
             processBuilder.redirectErrorStream(true);
 
             Process process = processBuilder.start();
-            process.waitFor();
-
-            boolean status = process.exitValue() == 0;
 
-            if(!status || !errorOutputOnly)
+            ArrayList<String> output = new ArrayList<String>();
             {
                 BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
                 String line = "";
                 while ((line = reader.readLine()) != null)
+                {
+                    output.add(line);
+                }
+            }
+            process.waitFor();
+
+            boolean status = process.exitValue() == 0;
+
+            if (!status || !errorOutputOnly)
+            {
+                for (String line : output)
                 {
                     System.out.println(line);
                 }