From 6dad12af478c8f6fde58a0967c161f3b51df4ac8 Mon Sep 17 00:00:00 2001
From: Thilina Shashimal Senarath <thilinasenarath97@gmail.com>
Date: Fri, 28 Jun 2024 11:02:48 +0530
Subject: [PATCH] Add ldap role update error code

---
 .../identity/scim2/common/impl/SCIMUserManager.java      | 9 ++++++---
 pom.xml                                                  | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
index f3742d8e4..bdb80d0df 100644
--- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
+++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
@@ -3535,9 +3535,12 @@ private void doPatchGroup(String groupId, String currentGroupName, Map<String, L
             // Update the group name in UM_HYBRID_GROUP_ROLE table.
             carbonUM.updateGroupName(currentGroupName, newGroupName);
         } catch (UserStoreException e) {
-            if (e instanceof org.wso2.carbon.user.core.UserStoreException && StringUtils
-                    .equals(UserCoreErrorConstants.ErrorMessages.ERROR_CODE_DUPLICATE_WHILE_WRITING_TO_DATABASE.getCode(),
-                            ((org.wso2.carbon.user.core.UserStoreException) e).getErrorCode())) {
+            if (e instanceof org.wso2.carbon.user.core.UserStoreException && (StringUtils
+                    .equals(UserCoreErrorConstants.ErrorMessages.ERROR_CODE_DUPLICATE_WHILE_WRITING_TO_DATABASE
+                            .getCode(), ((org.wso2.carbon.user.core.UserStoreException) e).getErrorCode()) ||
+                    StringUtils.equals(UserCoreErrorConstants.ErrorMessages
+                                    .ERROR_CODE_DUPLICATE_WHILE_UPDATING_USER_OF_ROLE.getCode(),
+                            ((org.wso2.carbon.user.core.UserStoreException) e).getErrorCode()))) {
                 // This handles the scenario where a unique key violation exception occurs when concurrent group
                 // patch requests try to add the same users to the group.
                 return;
diff --git a/pom.xml b/pom.xml
index 8ddbd9004..5da873c56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -284,7 +284,7 @@
         <cxf-bundle.version>3.3.7</cxf-bundle.version>
         <inbound.auth.oauth.version>6.5.3</inbound.auth.oauth.version>
         <commons-collections.version>3.2.0.wso2v1</commons-collections.version>
-        <carbon.kernel.version>4.10.12</carbon.kernel.version>
+        <carbon.kernel.version>4.10.16</carbon.kernel.version>
         <identity.framework.version>7.0.112</identity.framework.version>
         <junit.version>4.13.1</junit.version>
         <commons.lang.version>20030203.000129</commons.lang.version>