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

Timestamp:

2018-02-27T19:44:48+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15992 - more robust implementation of Utils.execOutput. Ensure calling a process never blocks the JVM

File:

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

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

@@ -10 +10 @@
 import java.awt.font.FontRenderContext;
 import java.awt.font.GlyphVector;
-import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -17 +16 @@
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.AccessibleObject;
@@ -856 +854 @@
             Logging.debug(join(" ", command));
         }
-        Process p = new ProcessBuilder(command).redirectErrorStream(true).start();
-        try (BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream(), StandardCharsets.UTF_8))) {
-            StringBuilder all = null;
-            String line;
-            while ((line = input.readLine()) != null) {
-                if (all == null) {
-                    all = new StringBuilder(line);
-                } else {
-                    all.append('\n')
-                       .append(line);
-                }
-            }
-            String msg = all != null ? all.toString() : null;
-            if (!p.waitFor(timeout, unit) || p.exitValue() != 0) {
-                throw new ExecutionException(msg, null);
-            }
-            return msg;
-        }
+        Path out = Files.createTempFile("josm_exec_", ".txt");
+        Process p = new ProcessBuilder(command).redirectErrorStream(true).redirectOutput(out.toFile()).start();
+        if (!p.waitFor(timeout, unit) || p.exitValue() != 0) {
+            throw new ExecutionException(command.toString(), null);
+        }
+        String msg = String.join("\n", Files.readAllLines(out)).trim();
+        try {
+            Files.delete(out);
+        } catch (IOException e) {
+            Logging.warn(e);
+        }
+        return msg;
     }