From 834898a4669d7268089600194a55dbb219fe72ac Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Fri, 26 May 2017 14:30:40 +0000 Subject: [PATCH] Catched Generic Exception git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@149153 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../workspace/server/GWTWorkspaceServiceImpl.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 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 efb94f8..3387cfc 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 @@ -2862,15 +2862,12 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT } Map> mapACL = folder.getACLOwner(); - ACLType settingACL = ACLType.valueOf(aclType); - workspaceLogger.info("Validating assignment: "+settingACL); workspaceLogger.info("To logins: "+listLogins); - AclTypeComparator comparator = new AclTypeComparator(); - List errors = new ArrayList(); + //TO REMOVE ADMINS List admins = mapACL.get(ACLType.ADMINISTRATOR); for (String admin : admins) { @@ -2885,7 +2882,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT //TO COMPLETE REPORT List validLogins = new ArrayList(listLogins); ReportAssignmentACL reportValidation = new ReportAssignmentACL(); - workspaceLogger.debug("\nChecking listLogins: "+listLogins); for (String username : listLogins) { @@ -2928,18 +2924,12 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT workspaceLogger.info("Set ACL: "+settingACL+ " to "+username); } - /* - System.out.println("\n"); - for (String error : errors) { - workspaceLogger.trace(error); - }*/ - reportValidation.setAclType(aclType); reportValidation.setErrors(errors); reportValidation.setValidLogins(validLogins); return reportValidation; - } catch (InternalErrorException e) { + } catch (Exception e) { throw new Exception("Sorry, an error occurred when validating ACL assignment, try again later"); } }else