summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java7
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;
}