From a34ae883a9236399ea7a0b7d2803ea6bad0f0901 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 23 May 2018 14:45:03 +0000 Subject: [PATCH] Fixing the issue: https://support.d4science.org/issues/11824#note-4 git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@167709 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/workspace/server/GWTWorkspaceServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 dac1af1..69418be 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 @@ -1959,8 +1959,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT try { - checkItemLocked(folder.getIdentifier()); - Workspace workspace = getWorkspace(); workspaceLogger.info("shareFolder "+ folder.getIdentifier() @@ -1970,7 +1968,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT +" ACL: "+acl); //DEBUG - printContacts(listContacts); + //printContacts(listContacts); List listLogin = UserUtil.getListLoginByInfoContactModel(listContacts); WorkspaceSharedFolder sharedFolder = null; @@ -1999,6 +1997,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT } } else{ + //IS NEW SHARED FOLDER FileModel parent = folder.getParentFileModel(); String parentId = ""; if(parent!=null){ @@ -2007,6 +2006,10 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT workspaceLogger.info("Parent is null, reading root ID from workspace"); parentId = getWorkspace().getRoot().getId(); } + + //CHECKING THAT THE PARENT IS NOT LOCKED + checkItemLocked(parentId); + sharedFolder = workspace.createSharedFolder(folder.getName(), folder.getDescription(), listLogin, parentId); } } @@ -2048,7 +2051,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT } catch (Exception e) { workspaceLogger.error("Error in shareFolder ", e); - e.printStackTrace(); String error = ConstantsExplorer.SERVER_ERROR+" creating shared folder."; throw new Exception(error); }