Update server/src/main/java/com/cloud/user/AccountManagerImpl.java

shwstppr · Copilot · web-flow · commit 56d80afc6ad6 · 2025-10-01T14:10:13.000+05:30
Co-authored-by: Copilot &lt;175728472+Copilot@users.noreply.github.com&gt;
diff --git a/server/src/main/java/com/cloud/user/AccountManagerImpl.java b/server/src/main/java/com/cloud/user/AccountManagerImpl.java
@@ -1398,7 +1398,7 @@ public Pair<Long, Account> doInTransaction(TransactionStatus status) {
      - New role should not be of type Admin with domain other than ROOT domain
      */
     protected void validateRoleChange(Account account, Role role, Account caller) {
-        if (account.getRoleId() == role.getId()) {
+        if (account.getRoleId() != null && account.getRoleId().equals(role.getId())) {
             return;
         }
         Role currentRole = roleService.findRole(account.getRoleId());

Original file line number	Diff line number	Diff line change
`@@ -1398,7 +1398,7 @@ public Pair<Long, Account> doInTransaction(TransactionStatus status) {`
`1398`	`1398`	`- New role should not be of type Admin with domain other than ROOT domain`
`1399`	`1399`	`*/`
`1400`	`1400`	`protected void validateRoleChange(Account account, Role role, Account caller) {`
`1401`		`- if (account.getRoleId() == role.getId()) {`
	`1401`	`+ if (account.getRoleId() != null && account.getRoleId().equals(role.getId())) {`
`1402`	`1402`	`return;`
`1403`	`1403`	`}`
`1404`	`1404`	`Role currentRole = roleService.findRole(account.getRoleId());`