From 576f2452814030083ea39a09f3fafc3d30cf65f9 Mon Sep 17 00:00:00 2001 From: Ola Aunronning Date: Tue, 2 May 2023 11:09:06 +0200 Subject: Don't OR credential deletion --- .../admin/maintenance/identity/AthenzCredentialsMaintainer.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'node-admin') 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); } -- cgit v1.2.3