From b539b48a6953cb7c7efe16fb42875ae0ad84e12d Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 6 Jul 2017 13:20:35 +0530 Subject: [PATCH] FIX2: Allow creation of roles with names of deleted roles This allows admins to create roles with names of previously deleted roles. Signed-off-by: Rohit Yadav --- server/src/org/apache/cloudstack/acl/RoleManagerImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/src/org/apache/cloudstack/acl/RoleManagerImpl.java b/server/src/org/apache/cloudstack/acl/RoleManagerImpl.java index 7363b13b35a..27cb3d0238a 100644 --- a/server/src/org/apache/cloudstack/acl/RoleManagerImpl.java +++ b/server/src/org/apache/cloudstack/acl/RoleManagerImpl.java @@ -50,6 +50,7 @@ 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}) @@ -172,7 +173,12 @@ public class RoleManagerImpl extends ManagerBase implements RoleService, Configu rolePermissionsDao.remove(rolePermission.getId()); } } - return roleDao.remove(role.getId()); + if (roleDao.remove(role.getId())) { + RoleVO roleVO = roleDao.findByIdIncludingRemoved(role.getId()); + roleVO.setName(role.getName() + "-deleted-" + new Date()); + return roleDao.update(role.getId(), roleVO); + } + return false; } }); }