From 0befb2cceb8e2634adf796cd99ed89342ad03bf3 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 9 Feb 2018 09:49:23 +0100 Subject: [PATCH] CLOUDSTACK-10269: On deletion of role set name to null (#2444) During deletion of role, set name to null. This fixes concurrent exception issue where previously it would rename the deleted role with a timestamp. 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 5b3998e8de8..5557aff71e0 100644 --- a/server/src/org/apache/cloudstack/acl/RoleManagerImpl.java +++ b/server/src/org/apache/cloudstack/acl/RoleManagerImpl.java @@ -18,7 +18,6 @@ package org.apache.cloudstack.acl; import java.util.ArrayList; import java.util.Collections; -import java.util.Date; import java.util.List; import javax.inject.Inject; @@ -172,7 +171,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;