From 4e3f7e17b807dd87569f0a2a43d33da080a3862c Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 2 Feb 2018 11:14:42 +0100 Subject: [PATCH] APPLE-525: Set role name to null on removal (CW-1647) On removal of a role, set the name to null. This fixes issue of mysql integrity exception when roles are created/deleted aggresively. Signed-off-by: Rohit Yadav --- server/src/org/apache/cloudstack/acl/RoleManagerImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/src/org/apache/cloudstack/acl/RoleManagerImpl.java b/server/src/org/apache/cloudstack/acl/RoleManagerImpl.java index 6cf8f9711b3..e8f519ef558 100644 --- a/server/src/org/apache/cloudstack/acl/RoleManagerImpl.java +++ b/server/src/org/apache/cloudstack/acl/RoleManagerImpl.java @@ -50,7 +50,6 @@ import javax.inject.Inject; import java.io.File; import java.util.ArrayList; import java.util.Collections; -import java.util.Date; import java.util.List; @Local(value = {RoleService.class}) @@ -175,7 +174,7 @@ public class RoleManagerImpl extends ManagerBase implements RoleService, Configu } if (roleDao.remove(role.getId())) { RoleVO roleVO = roleDao.findByIdIncludingRemoved(role.getId()); - roleVO.setName(role.getName() + "-deleted-" + new Date()); + roleVO.setName(null); return roleDao.update(role.getId(), roleVO); } return false;