commit b539b48a6953cb7c7efe16fb42875ae0ad84e12d
author Rohit Yadav <rohit.yadav@shapeblue.com> Thu Jul 06 13:20:35 2017 +0530
committer Rohit Yadav <rhtyd@users.noreply.github.com> Tue Jul 11 14:06:24 2017 +0530
tree 4e45bd4637efae8aae41158d586d3bf830ce8008
parent 9c82452b8252fbae754d208c0d2bedbe3a9505a2

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 <rohit.yadav@shapeblue.com>

server/src/org/apache/cloudstack/acl/RoleManagerImpl.java

diff --git a/server/src/org/apache/cloudstack/acl/RoleManagerImpl.java b/server/src/org/apache/cloudstack/acl/RoleManagerImpl.java
index 7363b13..27cb3d0 100644
--- a/server/src/org/apache/cloudstack/acl/RoleManagerImpl.java
+++ b/server/src/org/apache/cloudstack/acl/RoleManagerImpl.java
@@ -50,6 +50,7 @@
 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 @@
                             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;
                 }
             });
         }