diff options
author | Harald Musum <musum@oath.com> | 2018-02-07 14:44:23 +0100 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2018-02-07 14:44:23 +0100 |
commit | dc9146397a91a7ced8502e2559df4619747c1bea (patch) | |
tree | 90094722b11f09b4f4e334fc469fabb5ae891ac9 /filedistribution | |
parent | 699f3d561d29780f1ba545d1a8ad7df766fea1a2 (diff) |
Delete inprogress file in a finally clause
Diffstat (limited to 'filedistribution')
-rw-r--r-- | filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java index a43fb74554a..c95fe73ab4e 100644 --- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java +++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java @@ -115,7 +115,6 @@ public class FileReceiver { File decompressedDir = Files.createTempDirectory(tmpDir.toPath(), "archive").toFile(); log.log(LogLevel.DEBUG, "Archived file, unpacking " + inprogressFile + " to " + decompressedDir); CompressedFileReference.decompress(inprogressFile, decompressedDir); - Files.delete(inprogressFile.toPath()); moveFileToDestination(decompressedDir, fileReferenceDir); } else { try { @@ -130,6 +129,12 @@ public class FileReceiver { } catch (IOException e) { log.log(LogLevel.ERROR, "Failed writing file: " + e.getMessage(), e); throw new RuntimeException("Failed writing file: ", e); + } finally { + try { + Files.delete(inprogressFile.toPath()); + } catch (IOException e) { + log.log(LogLevel.ERROR, "Failed deleting " + inprogressFile.getAbsolutePath() + ": " + e.getMessage(), e); + } } return file; } |