LPS-115749 our usual order

liferay · Jul 21, 2020 · 21b2adc · 21b2adc
1 parent 8cd3da0
commit 21b2adc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...-service/src/main/java/com/liferay/account/service/impl/AccountGroupLocalServiceImpl.java b/...-service/src/main/java/com/liferay/account/service/impl/AccountGroupLocalServiceImpl.java
@@ -68,6 +68,8 @@ public AccountGroup addAccountGroup(
 
 	@Override
 	public AccountGroup deleteAccountGroup(AccountGroup accountGroup) {
+		accountGroupPersistence.remove(accountGroup);
+
 		List<AccountGroupAccountEntryRel> accountGroupAccountEntryRels =
 			accountGroupAccountEntryRelPersistence.findByAccountGroupId(
 				accountGroup.getAccountGroupId());
@@ -79,7 +81,7 @@ public AccountGroup deleteAccountGroup(AccountGroup accountGroup) {
 				accountGroupAccountEntryRel);
 		}
 
-		return accountGroupPersistence.remove(accountGroup);
+		return accountGroup;
 	}
 
 	@Override

diff --git a/...t-service/src/main/java/com/liferay/account/service/impl/AccountRoleLocalServiceImpl.java b/...t-service/src/main/java/com/liferay/account/service/impl/AccountRoleLocalServiceImpl.java
@@ -129,10 +129,10 @@ public void deleteAccountRolesByCompanyId(long companyId) {
 		for (AccountRole accountRole :
 				accountRolePersistence.findByCompanyId(companyId)) {
 
+			accountRolePersistence.remove(accountRole);
+
 			userGroupRoleLocalService.deleteUserGroupRolesByRoleId(
 				accountRole.getRoleId());
-
-			accountRolePersistence.remove(accountRole);
 		}
 	}