Changeset 16052 in josm

Timestamp:

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

Author:

simon04

Message:

fix #18878 - JOSM leaves behind josm_exec_ temp files

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/Utils.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/UtilsTest.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);
+            }
+        }
     }
 

trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java

@@ -596 +596 @@
         assertEquals(map4, Utils.toUnmodifiableMap(map4));
     }
+
+    /**
+     * Test of {@link Utils#execOutput}
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testExecOutput() throws Exception {
+        final String output = Utils.execOutput(Arrays.asList("echo", "Hello", "World"));
+        assertEquals("Hello World", output);
+    }
 }