[GitHub] [nifi] thenatog commented on a change in pull request #4416: NIFI-7568 - Ensure Kerberos mappings are applied correctly

[GitBox <gi...@apache.org>]

thenatog commented on a change in pull request #4416:
URL: https://github.com/apache/nifi/pull/4416#discussion_r459495155



##########
File path: nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/impl/StandardKeyService.java
##########
@@ -118,11 +118,20 @@ public void deleteKey(String identity) {
             transaction = transactionBuilder.start();
 
             // delete the keys
-            DeleteKeysAction deleteKeys = new DeleteKeysAction(identity);
-            transaction.execute(deleteKeys);
-
-            // commit the transaction
-            transaction.commit();
+            DeleteKeyAction deleteKey = new DeleteKeyAction(keyId);
+            Integer rowsDeleted = transaction.execute(deleteKey);
+
+            // commit the transaction if we found one and only one matching user identity
+
+            if (rowsDeleted == 0) {
+                rollback(transaction);
+                throw new AdministrationException("Unable to find user key for key ID " + keyId + " to remove token.");
+            } else if (rowsDeleted > 1) {

Review comment:
       Yeah this is true, keyId refers to the ID column, whereas previously the delete used the identity which theoretically could have been multiple rows. @mcgilman, was there any specific need for the DeleteKey(s) mechanism to delete multiple rows/identities? See changes to StandardKeyDao.java.




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org