This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch 4.11
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.11 by this push:
     new 0befb2c  CLOUDSTACK-10269: On deletion of role set name to null (#2444)
0befb2c is described below

commit 0befb2cceb8e2634adf796cd99ed89342ad03bf3
Author: Rohit Yadav <ro...@apache.org>
AuthorDate: Fri Feb 9 09:49:23 2018 +0100

    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 <rohit.ya...@shapeblue.com>
---
 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 5b3998e..5557aff 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;

-- 
To stop receiving notification emails like this one, please contact
d...@apache.org.

Reply via email to