Merge pull request #513 from ZiyamSanthosh/master-beta2-security

Refine string value comparison logic to improve code quality
wso2-extensions · Nov 30, 2023 · 588ecd6 · 588ecd6
2 parents e4b517a + 8f3be5e
commit 588ecd6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...cim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java b/...cim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.identity.scim2.common.impl;
 
+import java.util.Objects;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.ListUtils;
 import org.apache.commons.collections.MapUtils;
@@ -2394,8 +2395,9 @@ private Boolean hasBothIdentityClaimAndDefaultClaims(List<ExpressionCondition> e
             for (ExpressionCondition expressionCondition : expressionConditions) {
                 List<LocalClaim> mappedClaim =
                         claimMapping1.stream()
-                                .filter(mapping -> mapping.getMappedAttributes().get(0).getAttributeName() ==
-                                        expressionCondition.getAttributeName()).collect(Collectors.toList());
+                                .filter(mapping -> Objects.equals(
+                                        mapping.getMappedAttributes().get(0).getAttributeName(),
+                                        expressionCondition.getAttributeName())).collect(Collectors.toList());
                 //Obtaining relevant URI for the mapped attribute.
                 if (mappedClaim.size() == 1) {
                     String tempClaimURI = mappedClaim.get(0).getClaimURI();