From 85dcb499e040f404d1f6cc7b585e43a24ca21c57 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Fri, 26 May 2017 14:51:04 +0000 Subject: [PATCH] Fixed bug on setting ACL git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@149163 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../workspace/server/GWTWorkspaceServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java index a1aa1c4..b751c4c 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java @@ -2870,12 +2870,14 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT //TO REMOVE ADMINS List admins = mapACL.get(ACLType.ADMINISTRATOR); - for (String admin : admins) { - boolean removed = listLogins.remove(admin); - workspaceLogger.info("Reject username: "+admin +" as "+ACLType.ADMINISTRATOR); - if(removed){ - String fullname = isTestMode()?admin: UserUtil.getUserFullName(admin); - errors.add("Unable to grant the privilege "+settingACL+" for "+fullname+", he/she is an: "+ ACLType.ADMINISTRATOR); + if(admins !=null){ + for (String admin : admins) { + boolean removed = listLogins.remove(admin); + workspaceLogger.info("Reject username: "+admin +" as "+ACLType.ADMINISTRATOR); + if(removed){ + String fullname = isTestMode()?admin: UserUtil.getUserFullName(admin); + errors.add("Unable to grant the privilege "+settingACL+" for "+fullname+", he/she is an: "+ ACLType.ADMINISTRATOR); + } } }