diff options
| author | Håkon Hallingstad <hakon@oath.com> | 2018-11-12 13:14:04 +0100 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@oath.com> | 2018-11-12 13:14:04 +0100 |
| commit | 3f820ab06cb527886dc0e0a7c9913d516a776da0 (patch) | |
| tree | e577141e8096d3c7eaf874143059bc3f2f19fcbb /node-admin | |
| parent | f45ca935589af1372bc8bb474a95514022eee3b8 (diff) | |
Remove old tmp file
Diffstat (limited to 'node-admin')
2 files changed, 5 insertions, 3 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java index 8c5104f0152..abac16d242e 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java @@ -219,6 +219,7 @@ public class AthenzCredentialsMaintainer { private static void writeFile(Path path, String vespaUserOnHost, String utf8Content) { new UnixPath(path.toString() + ".tmp") + .deleteIfExists() .createNewFile("r--------") .setOwner(vespaUserOnHost) .writeUtf8File(utf8Content) diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPath.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPath.java index 8e72c3e0385..4bd3aad3f52 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPath.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPath.java @@ -170,11 +170,12 @@ public class UnixPath { } } - return deleteIfExists(); + return uncheck(() -> Files.deleteIfExists(path)); } - public boolean deleteIfExists() { - return uncheck(() -> Files.deleteIfExists(path)); + public UnixPath deleteIfExists() { + uncheck(() -> Files.deleteIfExists(path)); + return this; } public List<UnixPath> listContentsOfDirectory() { |