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

Timestamp:

2020-03-07T10:03:06+01:00 (5 years ago)

Author:

simon04

Message:

fix #18878 - JOSM leaves behind josm_exec_ temp files

File:

• trunk/src/org/openstreetmap/josm/tools/Utils.java (modified) (1 diff)

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

@@ -922 +922 @@
             Logging.debug(String.join(" ", command));
         }
-        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();
+        Path out = Files.createTempFile("josm_exec_" + command.get(0) + "_", ".txt");
         try {
-            Files.delete(out);
-        } catch (IOException e) {
-            Logging.warn(e);
-        }
-        return msg;
+            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);
+            }
+            return String.join("\n", Files.readAllLines(out)).trim();
+        } finally {
+            try {
+                Files.delete(out);
+            } catch (IOException e) {
+                Logging.warn(e);
+            }
+        }
     }