From 7e06739d8ced91108f283fbbd4145813b536c280 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Thu, 19 Apr 2018 09:11:23 +0000 Subject: [PATCH] Managed case of Exception in order to avoid failure on checkItemLocked git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@167120 82a268e6-3cf1-43bd-a215-b396298e98cf --- distro/changelog.xml | 7 ++++++- pom.xml | 2 +- .../user/workspace/server/GWTWorkspaceServiceImpl.java | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/distro/changelog.xml b/distro/changelog.xml index 3979277..2384c3f 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,8 +1,13 @@ + + Managed case of Exception in order to avoid failure on checkItemLocked + [Task #11127] Porting to new ws-thredds engine - [Feature #11325] Workspace: add New URL feature in the context menu of right pane + [Feature #11325] Workspace: add New URL feature in the context + menu of right pane diff --git a/pom.xml b/pom.xml index 78ee676..a52d53d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.gcube.portlets.user workspace-tree-widget - 6.20.0-SNAPSHOT + 6.20.1-SNAPSHOT gCube Workspace Tree Widget gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace 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 24fe651..dac1af1 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 @@ -4361,6 +4361,10 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT }catch(InternalErrorException | ItemNotFoundException | HomeNotFoundException | WorkspaceFolderNotFoundException e){ workspaceLogger.warn(e); throw new Exception("Sorry an error occurred during checking is folder locked, Refresh and try again"); + + }catch (Exception e) { + workspaceLogger.warn("Was there an Exception HL side? Ignoring it.. returning false (that means item not locked)"); + return false; } }