Changeset 13467 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-02-26T19:54:01+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15992 - make sure PowerShell call is never blocking

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• PlatformHookWindows.java (modified) (3 diffs)
• Utils.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -66 +66 @@
 import java.util.Properties;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -725 +726 @@
     public static int getPowerShellVersion() {
         try {
-            return Integer.valueOf(Utils.execOutput(Arrays.asList("powershell", "-Command", "$PSVersionTable.PSVersion.Major")));
+            return Integer.valueOf(Utils.execOutput(Arrays.asList(
+                    "powershell", "-Command", "$PSVersionTable.PSVersion.Major"), 2, TimeUnit.SECONDS));
         } catch (NumberFormatException | IOException | ExecutionException | InterruptedException e) {
             Logging.error(e);
@@ -750 +752 @@
                         "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;"+
                         "[System.Net.WebRequest]::Create('"+uri+"').GetResponse()"
-                        ));
+                        ), 5, TimeUnit.SECONDS);
             } catch (ExecutionException | InterruptedException e) {
                 Logging.error(e);

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -827 +827 @@
      * Runs an external command and returns the standard output.
      *
-     * The program is expected to execute fast.
+     * The program is expected to execute fast, as this call waits 10 seconds at most.
      *
      * @param command the command with arguments
@@ -836 +836 @@
      */
     public static String execOutput(List<String> command) throws IOException, ExecutionException, InterruptedException {
+        return execOutput(command, 10, TimeUnit.SECONDS);
+    }
+
+    /**
+     * Runs an external command and returns the standard output. Waits at most the specified time.
+     *
+     * @param command the command with arguments
+     * @param timeout the maximum time to wait
+     * @param unit the time unit of the {@code timeout} argument. Must not be null
+     * @return the output
+     * @throws IOException when there was an error, e.g. command does not exist
+     * @throws ExecutionException when the return code is != 0. The output is can be retrieved in the exception message
+     * @throws InterruptedException if the current thread is {@linkplain Thread#interrupt() interrupted} by another thread while waiting
+     * @since 13467
+     */
+    public static String execOutput(List<String> command, long timeout, TimeUnit unit)
+            throws IOException, ExecutionException, InterruptedException {
         if (Logging.isDebugEnabled()) {
             Logging.debug(join(" ", command));
@@ -852 +869 @@
             }
             String msg = all != null ? all.toString() : null;
-            if (p.waitFor() != 0) {
+            if (!p.waitFor(timeout, unit)) {
+                throw new ExecutionException(msg, null);
+            }
+            if (p.exitValue() != 0) {
                 throw new ExecutionException(msg, null);
             }