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 <rohit.yadav@shapeblue.com>
diff --git a/server/src/org/apache/cloudstack/acl/RoleManagerImpl.java b/server/src/org/apache/cloudstack/acl/RoleManagerImpl.java
index 6cf8f97..e8f519e 100644
--- a/server/src/org/apache/cloudstack/acl/RoleManagerImpl.java
+++ b/server/src/org/apache/cloudstack/acl/RoleManagerImpl.java
@@ -50,7 +50,6 @@
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 @@
}
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;
