Simplify try-finally

1 files changed, 8 insertions, 12 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImpl.java
index 705aea1aafc..1c7a60a13fc 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImpl.java
@@ -74,19 +74,15 @@ public class ProcessFactoryImpl implements ProcessFactory {
         try {
             processBuilder.redirectOutput(temporaryFile.toFile());
             ProcessApi2 process = processStarter.start(processBuilder);
-            ChildProcess2Impl child = new ChildProcess2Impl(commandLine, process, temporaryFile, timer);
-            // child is now responsible for deleting temporaryFile (it's AutoClosable)
-            temporaryFile = null;
-            return child;
-        } finally {
-            if (temporaryFile != null) {
-                try {
-                    Files.delete(temporaryFile);
-                } catch (IOException e) {
-                    logger.log(LogLevel.WARNING, "Failed to delete temporary file at " +
-                            temporaryFile, e);
-                }
+            return new ChildProcess2Impl(commandLine, process, temporaryFile, timer);
+        } catch (RuntimeException | Error throwable) {
+            try {
+                Files.delete(temporaryFile);
+            } catch (IOException ioException) {
+                logger.log(LogLevel.WARNING, "Failed to delete temporary file at " +
+                        temporaryFile, ioException);
             }
+            throw throwable;
         }
 
     }