Changeset 12830 in josm for trunk/src/org/openstreetmap/josm/tools/Utils.java

Timestamp:

2017-09-12T17:23:17+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15297, fix #15298 - proper detection of java packages on rpm-based Linux systems

File:

• trunk/src/org/openstreetmap/josm/tools/Utils.java (modified) (3 diffs)

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

@@ -45 +45 @@
 import java.util.List;
 import java.util.Locale;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ForkJoinPool;
@@ -867 +868 @@
      * @return the output
      * @throws IOException when there was an error, e.g. command does not exist
-     */
-    public static String execOutput(List<String> command) throws IOException {
+     * @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
+     */
+    public static String execOutput(List<String> command) throws IOException, ExecutionException, InterruptedException {
         if (Logging.isDebugEnabled()) {
             Logging.debug(join(" ", command));
@@ -884 +887 @@
                 }
             }
-            return all != null ? all.toString() : null;
+            String msg = all != null ? all.toString() : null;
+            if (p.waitFor() != 0) {
+                throw new ExecutionException(msg, null);
+            }
+            return msg;
         }
     }