From c44c3cdd7697228aeeda62b2ac0db1e2e663792d Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Tue, 1 Oct 2019 13:01:05 +0200
Subject: [PATCH] openvidu-server: CommandExecutor refactoring

---
 .../server/utils/CommandExecutor.java         | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/openvidu-server/src/main/java/io/openvidu/server/utils/CommandExecutor.java b/openvidu-server/src/main/java/io/openvidu/server/utils/CommandExecutor.java
index e486235c..c7dc406b 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/utils/CommandExecutor.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/utils/CommandExecutor.java
@@ -22,6 +22,9 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
+/**
+ * @author Pablo Fuente (pablofuenteperez@gmail.com)
+ */
 public class CommandExecutor {
 
 	public static String execCommand(String... command) throws IOException, InterruptedException {
@@ -40,23 +43,34 @@ public class CommandExecutor {
 			String... command) throws IOException, InterruptedException {
 		ProcessBuilder processBuilder = new ProcessBuilder(command).redirectOutput(standardOutputFile)
 				.redirectError(errorOutputFile);
-		commonExecCommand(processBuilder);
+		Process process = processBuilder.start();
+		process.waitFor();
 	}
 
 	private static String commonExecCommand(ProcessBuilder processBuilder) throws IOException, InterruptedException {
 		Process process = processBuilder.start();
 		StringBuilder processOutput = new StringBuilder();
-
-		try (BufferedReader processOutputReader = new BufferedReader(
-				new InputStreamReader(process.getInputStream()));) {
-
+		String output;
+		InputStreamReader inputStreamReader = null;
+		BufferedReader processOutputReader = null;
+		try {
+			inputStreamReader = new InputStreamReader(process.getInputStream());
+			processOutputReader = new BufferedReader(inputStreamReader);
 			String readLine;
 			while ((readLine = processOutputReader.readLine()) != null) {
 				processOutput.append(readLine + System.lineSeparator());
 			}
 			process.waitFor();
+			output = processOutput.toString().trim();
+		} finally {
+			if (inputStreamReader != null) {
+				inputStreamReader.close();
+			}
+			if (processOutputReader != null) {
+				processOutputReader.close();
+			}
 		}
-		return processOutput.toString().trim();
+		return output;
 	}
 
 }