summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorOla Aunronning <olaa@yahooinc.com>2023-05-02 11:09:06 +0200
committerOla Aunronning <olaa@yahooinc.com>2023-05-02 11:09:06 +0200
commit576f2452814030083ea39a09f3fafc3d30cf65f9 (patch)
tree09316fddeada680bfa1c4a252279536430af8836 /node-admin
parent6ce4ab0f38389d93d8b057afc07b55f603a8c44f (diff)
Don't OR credential deletion
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java7
1 files changed, 4 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 57a6ceb68aa..503e69c8f66 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
@@ -278,9 +278,10 @@ public class AthenzCredentialsMaintainer implements CredentialsMaintainer {
var privateKeyFile = (ContainerPath) SiaUtils.getPrivateKeyFile(siaDirectory, athenzIdentity);
var certificateFile = (ContainerPath) SiaUtils.getCertificateFile(siaDirectory, athenzIdentity);
try {
- return Files.deleteIfExists(identityDocumentFile) ||
- Files.deleteIfExists(privateKeyFile) ||
- Files.deleteIfExists(certificateFile);
+ var modified = Files.deleteIfExists(identityDocumentFile);
+ modified |= Files.deleteIfExists(privateKeyFile);
+ modified |= Files.deleteIfExists(certificateFile);
+ return modified;
} catch (IOException e) {
throw new UncheckedIOException(e);
}