From 0620d256b25dd5e2f3b88dcf3139c766edd4b440 Mon Sep 17 00:00:00 2001 From: Yaroslav Afenkin Date: Wed, 31 Jan 2024 11:24:58 +0200 Subject: [PATCH] Address review feedback --- .../plugins/credentials/SystemCredentialsProvider.java | 2 +- .../cloudbees/plugins/credentials/UserCredentialsProvider.java | 2 +- .../plugins/credentials/MockFolderCredentialsProvider.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cloudbees/plugins/credentials/SystemCredentialsProvider.java b/src/main/java/com/cloudbees/plugins/credentials/SystemCredentialsProvider.java index d905908e..a3fe3e6d 100644 --- a/src/main/java/com/cloudbees/plugins/credentials/SystemCredentialsProvider.java +++ b/src/main/java/com/cloudbees/plugins/credentials/SystemCredentialsProvider.java @@ -326,7 +326,7 @@ private synchronized boolean updateCredentials(@NonNull Domain domain, @NonNull checkPermission(CredentialsProvider.UPDATE); Map> domainCredentialsMap = getDomainCredentialsMap(); if (domainCredentialsMap.containsKey(domain)) { - if (current instanceof IdCredentials && replacement instanceof IdCredentials) { + if (current instanceof IdCredentials || replacement instanceof IdCredentials) { if (!current.equals(replacement)) { throw new IllegalArgumentException("Credentials' IDs do not match, will not update."); } diff --git a/src/main/java/com/cloudbees/plugins/credentials/UserCredentialsProvider.java b/src/main/java/com/cloudbees/plugins/credentials/UserCredentialsProvider.java index fc3c2490..17b1d4bd 100644 --- a/src/main/java/com/cloudbees/plugins/credentials/UserCredentialsProvider.java +++ b/src/main/java/com/cloudbees/plugins/credentials/UserCredentialsProvider.java @@ -395,7 +395,7 @@ private synchronized boolean updateCredentials(@NonNull Domain domain, @NonNull checkPermission(CredentialsProvider.UPDATE); Map> domainCredentialsMap = getDomainCredentialsMap(); if (domainCredentialsMap.containsKey(domain)) { - if (current instanceof IdCredentials && replacement instanceof IdCredentials) { + if (current instanceof IdCredentials || replacement instanceof IdCredentials) { if (!current.equals(replacement)) { throw new IllegalArgumentException("Credentials' IDs do not match, will not update."); } diff --git a/src/test/java/com/cloudbees/plugins/credentials/MockFolderCredentialsProvider.java b/src/test/java/com/cloudbees/plugins/credentials/MockFolderCredentialsProvider.java index 00ee809b..21d851bd 100644 --- a/src/test/java/com/cloudbees/plugins/credentials/MockFolderCredentialsProvider.java +++ b/src/test/java/com/cloudbees/plugins/credentials/MockFolderCredentialsProvider.java @@ -333,7 +333,7 @@ private synchronized boolean updateCredentials(@NonNull Domain domain, @NonNull checkPermission(CredentialsProvider.UPDATE); Map> domainCredentialsMap = getDomainCredentialsMap(); if (domainCredentialsMap.containsKey(domain)) { - if (current instanceof IdCredentials && replacement instanceof IdCredentials) { + if (current instanceof IdCredentials || replacement instanceof IdCredentials) { if (!current.equals(replacement)) { throw new IllegalArgumentException("Credentials' IDs do not match, will not update."); }