Improve list discovery attributes of organizations method

wso2-extensions · Oct 21, 2023 · 64e2f48 · 64e2f48
1 parent 9f26dce
commit 64e2f48
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...wso2/carbon/identity/organization/discovery/service/dao/OrganizationDiscoveryDAOImpl.java b/...wso2/carbon/identity/organization/discovery/service/dao/OrganizationDiscoveryDAOImpl.java
@@ -305,26 +305,26 @@ private List<OrganizationDiscovery> buildOrganizationsDiscoveryFromRawData(
             } else {
                 List<OrgDiscoveryAttribute> discoveryAttributes = existingDiscovery.getDiscoveryAttributes();
                 boolean attributeExists = false;
-                List<String> newAttributeValues = new ArrayList<>();
+                String newAttributeValue = null;
                 List<String> existingAttributeValues = null;
-                List<String> attributeValues = new ArrayList<>();
                 for (OrgDiscoveryAttribute attribute : discoveryAttributes) {
                     if (StringUtils.equals(attribute.getType(), attributeType)) {
                         existingAttributeValues = attribute.getValues();
-                        newAttributeValues.add(attributeValue);
+                        newAttributeValue = attributeValue;
                         attributeExists = true;
+                        break;
                     }
                 }
 
                 if (attributeExists) {
                     for (OrgDiscoveryAttribute attribute : discoveryAttributes) {
                         if (StringUtils.equals(attribute.getType(), attributeType)) {
                             if (existingAttributeValues == null) {
-                                attribute.setValues(newAttributeValues);
+                                attribute.setValues(Collections.singletonList(newAttributeValue));
                                 break;
                             }
-                            attributeValues.addAll(existingAttributeValues);
-                            attributeValues.addAll(newAttributeValues);
+                            List<String> attributeValues = new ArrayList<>(existingAttributeValues);
+                            attributeValues.add(newAttributeValue);
                             attribute.setValues(attributeValues);
                             break;
                         }