Merge remote-tracking branch 'apache/4.19'

apache · Jul 8, 2024 · 1144f52 · 1144f52
2 parents 3c9bc07 + b080215
commit 1144f52
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/utils/src/main/java/com/cloud/utils/script/Script.java b/utils/src/main/java/com/cloud/utils/script/Script.java
@@ -661,8 +661,8 @@ public static String getExecutableAbsolutePath(String executable) {
         return executable;
     }
 
-    private static Script getScriptForCommandRun(String... command) {
-        Script s = new Script(command[0], 0);
+    private static Script getScriptForCommandRun(long timeout, String... command) {
+        Script s = new Script(command[0], timeout);
         if (command.length > 1) {
             for (int i = 1; i < command.length; ++i) {
                 s.add(command[i]);
@@ -671,12 +671,16 @@ private static Script getScriptForCommandRun(String... command) {
         return s;
     }
 
+    private static Script getScriptForCommandRun(String... command) {
+        return getScriptForCommandRun(0, command);
+    }
+
     public static String executeCommand(String... command) {
         return runScript(getScriptForCommandRun(command));
     }
 
     public static int executeCommandForExitValue(long timeout, String... command) {
-        return runScriptForExitValue(getScriptForCommandRun(command));
+        return runScriptForExitValue(getScriptForCommandRun(timeout, command));
     }
 
     public static int executeCommandForExitValue(String... command) {