commit e33895f5580c914f50f490830e91e9409e7957d8
author 11rx4f <ryosuke.okada@fujitsu.com> Tue Sep 14 18:41:45 2021 +0900
committer David Matějček <dmatej@seznam.cz> Wed Sep 22 10:01:43 2021 +0200
tree 64da8e60c7f7879e18fe4dea25d7c5b7db09305d
parent 178af6400c343decae62026c0fcc68071db285d3

Fix #23602 update-connector-security-map can be executed using both addusergroups and addprincipals options

Signed-off-by: 11rx4f <ryosuke.okada@fujitsu.com>

appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorSecurityMap.java

diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorSecurityMap.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorSecurityMap.java
index 980d4f4..ec2bf05 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorSecurityMap.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorSecurityMap.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -369,16 +370,16 @@
      * @return boolean true - if it is a homogeneous security map, false otherwise.
      */
     private boolean hasOnlyPrincipalsOrOnlyUserGroups(ActionReport report,
-        List<String> existingPrincipals, List<String> existingUserGroups) {
-        if (existingPrincipals.isEmpty() && addPrincipals != null) {
-           report.setMessage(localStrings.getLocalString("update.connector.security.map." +
-                   "addPrincipalToExistingUserGroupsWorkSecurityMap",
-                   "Failed to add principals to a security map with user groups."));
-           report.setActionExitCode(ActionReport.ExitCode.FAILURE);
+            List<String> existingPrincipals, List<String> existingUserGroups) {
+        if (!existingUserGroups.isEmpty() && addPrincipals != null) {
+            report.setMessage(localStrings.getLocalString("update.connector.security.map." +
+                    "addPrincipalToExistingUserGroupsWorkSecurityMap",
+                    "Failed to add principals to a security map with user groups."));
+            report.setActionExitCode(ActionReport.ExitCode.FAILURE);
             return false;
-       }
+        }
 
-        if (existingUserGroups.isEmpty() && addUserGroups != null) {
+        if (!existingPrincipals.isEmpty() && addUserGroups != null) {
             report.setMessage(localStrings.getLocalString("update.connector.security.map." +
                     "addUserGroupsToExistingPrincipalsWorkSecurityMap",
                     "Failed to add user groups to a security map with principals."));