From 9a277a0d79f55331049e67e197caaa7258b43ebe Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Fri, 20 May 2016 07:49:29 +0000 Subject: [PATCH] 4055: Workspace Uploder enhancement: work with multiple-instances of DnD Workspace Uploader in the DOM Task-Url: https://support.d4science.org/issues/4055 Added check on isErasable git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-uploader@128722 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../workspaceuploader/server/WorkspaceUploaderServiceImpl.java | 2 +- .../workspaceuploader/shared/WorkspaceUploaderItem.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploaderServiceImpl.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploaderServiceImpl.java index cb62e83..287af32 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploaderServiceImpl.java +++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploaderServiceImpl.java @@ -85,7 +85,7 @@ public class WorkspaceUploaderServiceImpl extends RemoteServiceServlet implement public void run() { try { - logger.trace("Uploader: "+uploader.getClientUploadKey() +"is erasable?"); + logger.trace("Uploader: "+uploader.getClientUploadKey() +", is erasable?"); WsUtil.eraseWorkspaceUploaderInSession(httpSession, uploader); } catch (Exception e) { diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/shared/WorkspaceUploaderItem.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/shared/WorkspaceUploaderItem.java index 55f121f..5a64634 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/shared/WorkspaceUploaderItem.java +++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/shared/WorkspaceUploaderItem.java @@ -229,6 +229,9 @@ public class WorkspaceUploaderItem implements Serializable{ */ public Boolean isErasable() { + if(erasable==null) + return false; + return erasable; }